diff --git a/.collaboration b/.collaboration index 9b1f1a79..6fe4fc00 100644 --- a/.collaboration +++ b/.collaboration @@ -382,31 +382,11 @@ }, { "ModuleName": "PCPage/FGC_修改密码", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T13:09:26.8879576+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\FGC_修改密码.json", - "Pages\\内建页面\\FGC_修改密码.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_修改用户信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T13:06:48.3968356+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\FGC_修改用户信息.json", - "Pages\\内建页面\\FGC_修改用户信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_忘记密码", @@ -414,17 +394,7 @@ }, { "ModuleName": "PCPage/FGC_登录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T10:22:14.3222247+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\FGC_登录.json", - "Pages\\内建页面\\FGC_登录.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_维护中", @@ -572,17 +542,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:22:03.9433325+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面", @@ -626,33 +586,11 @@ }, { "ModuleName": "PCPage/项目反馈", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:48:59.1710709+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目版本管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:50:02.3520955+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本管理.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本管理.rd", - "Pages\\97bdc47834844e0d8f3a5aef747785e.json", - "Pages\\97bdc47834844e0d8f3a5aef747785e.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目版本配置", @@ -692,17 +630,7 @@ }, { "ModuleName": "PCPage/项目预算申请历史", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:51:17.4594752+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\预算申请\\项目预算申请历史.json", - "Pages\\项目\\项目首页\\预算申请\\项目预算申请历史.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目反馈", @@ -726,31 +654,11 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T10:36:56.5155999+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json", - "Pages\\任务\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T10:39:39.6771744+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务部分.json", - "Pages\\任务\\任务部分.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-侧栏", @@ -762,79 +670,23 @@ }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T10:46:20.5134709+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-任务信息.json", - "Pages\\任务\\任务-任务信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T10:40:33.3807362+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-关联资源.json", - "Pages\\任务\\任务-关联资源.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-子任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T10:36:15.3559387+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-子任务列表.json", - "Pages\\任务\\任务-子任务列表.rd", - "Pages\\558ca610fafc4ffd8884b819161bfd6.json", - "Pages\\558ca610fafc4ffd8884b819161bfd6.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T10:41:51.3814903+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-工时.json", - "Pages\\任务\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T10:44:47.2406218+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-进展.json", - "Pages\\任务\\任务-进展.rd", - "Pages\\77fae08dfbac4664a299aa7ec207218.json", - "Pages\\77fae08dfbac4664a299aa7ec207218.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情-列头", @@ -902,17 +754,7 @@ }, { "ModuleName": "PCPage/编辑删除页面", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T10:31:28.3908709+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\编辑删除页面.json", - "Pages\\共用\\编辑删除页面.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/HTML详情", @@ -932,17 +774,7 @@ }, { "ModuleName": "PCPage/客户管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:53:12.61362+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\客户\\客户管理.json", - "Pages\\客户\\客户管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/客户详情", @@ -990,31 +822,11 @@ }, { "ModuleName": "PCPage/工时总览", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:46:25.7737458+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\工时总览.json", - "Pages\\工时\\工时总览.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T13:33:01.4359287+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\工时首页.json", - "Pages\\工时\\工时首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务工时统计", @@ -1030,61 +842,19 @@ }, { "ModuleName": "PCPage/个人中心", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T13:09:36.9676722+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心.json", - "Pages\\个人中心\\个人中心.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T13:04:15.8624434+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-基本信息.json", - "Pages\\个人中心\\个人中心-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-我的收益", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T13:08:17.9625512+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-我的收益.json", - "Pages\\个人中心\\个人中心-我的收益.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-收款账户", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T13:00:37.4272287+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-收款账户.json", - "Pages\\个人中心\\个人中心-收款账户.rd", - "Pages\\9194032cc73440d49d0193bce31608b.json", - "Pages\\9194032cc73440d49d0193bce31608b.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/财务", @@ -1096,59 +866,19 @@ }, { "ModuleName": "PCPage/收益中心", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T13:23:45.4200556+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\收益中心.json", - "Pages\\收益\\收益中心.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/收益中心-收益请款记录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:54:39.1369929+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\收益中心-收益请款记录.json", - "Pages\\收益\\收益中心-收益请款记录.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/收益中心-变动记录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:55:03.2087056+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\收益中心-变动记录.json", - "Pages\\收益\\收益中心-变动记录.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/收益中心-收益明细", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:55:29.5493572+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\收益中心-收益明细.json", - "Pages\\收益\\收益中心-收益明细.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/提交结算申请单", @@ -1156,17 +886,7 @@ }, { "ModuleName": "PCPage/审批结算申请单", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:56:26.4805517+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\审批结算申请单.json", - "Pages\\收益\\审批结算申请单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/办理结算审批单", @@ -1214,17 +934,7 @@ }, { "ModuleName": "UserControlPage/收益数据横幅", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:46:57.3631811+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\收益数据横幅.json", - "UserControlPages\\收益数据横幅.rd" - ] + "ModuleType": 31 }, { "ModuleName": "UserControlPage/输入框", @@ -1336,16 +1046,7 @@ }, { "ModuleName": "ServerCommand/更新用户配置", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T13:06:48.3966786+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\用户\\更新用户配置.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/项目反馈", @@ -1429,17 +1130,7 @@ }, { "ModuleName": "ProcessItem/反馈处理流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:52:12.1215943+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\反馈处理流程.json", - "Process\\反馈处理流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/结算申请", @@ -1855,33 +1546,11 @@ }, { "ModuleName": "PCPage/日报首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:53:28.401512+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\日报\\日报首页.json", - "Pages\\汇报\\日报\\日报首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目周报首页", - "State": 4, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:23:01.0376294+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\项目周报\\项目周报首页.json", - "Pages\\汇报\\项目周报\\项目周报首页.rd", - "Pages\\50f88f59718b4ba78fa3fc76286d95b.json", - "Pages\\50f88f59718b4ba78fa3fc76286d95b.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/汇报/日报", @@ -1893,31 +1562,11 @@ }, { "ModuleName": "PCPage/项目周报详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T10:48:44.6587882+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\项目周报\\项目周报详情.json", - "Pages\\汇报\\项目周报\\项目周报详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目周报列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:50:40.8936454+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目周报列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目周报列表.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/AI生成周报", @@ -1933,12 +1582,6 @@ }, { "ModuleName": "PCPage/账户信息", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-05-25T12:57:39.8921582+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/50f88f59718b4ba78fa3fc76286d95b.json b/Pages/50f88f59718b4ba78fa3fc76286d95b.json index 0d3abfac..d8aea802 100644 --- a/Pages/50f88f59718b4ba78fa3fc76286d95b.json +++ b/Pages/50f88f59718b4ba78fa3fc76286d95b.json @@ -54,7 +54,7 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 28.0, + "DesignLengthInPixel": 24.0, "IsHidden": true } }, @@ -97,7 +97,7 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 45.0 } }, "2": { @@ -107,7 +107,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 45.0 } }, "4": { @@ -117,7 +117,7 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 45.0 } }, "6": { @@ -149,7 +149,7 @@ } }, "Count": 10, - "DefaultSize": 50.0 + "DefaultSize": 45.0 }, "Values": { "3,1": "上周工作：", @@ -202,19 +202,9 @@ "TemplateCellSource": "汇报人" }, "4,1": { - "CellType": { - "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor", - "ShowToolBars": false, - "ReadOnly": true - }, "TemplateCellSource": "上周工作" }, "7,1": { - "CellType": { - "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor", - "ShowToolBars": false, - "ReadOnly": true - }, "TemplateCellSource": "本周计划" }, "9,1": { @@ -496,4 +486,4 @@ "PaperSize": {}, "Margin": {} } -}//Jx0H3MkKGV08r1kENpl+T2+8zjpomTy5cL3UhV81hI2NFHJMcbADAd/JtTwI5lsYT5A/4xLRWDekz4usr2m2lCCLIfQty+ThR7lGyF1OOZtD6/fdIeFAVuCTSaqYAURyHGM79dBblsSQ84T7fZ6oTuhYPWhBm7BJSs/375NKumsTTHkBWoL8hjgw6GkX++/poz7XuJXOeTQvgegkrMK9QLSZA2ggkWd1uQbL9CIplwJEisdiWsioHCv00H2gSvgMqy6xhX6E7cnabodmsfDsIJF2wByHnp90ZWGVlnWZeJH7d2TcarFp8F8NyL/uQs8SZd+tDI9Ow2DJB4KjJKga3hD3u5w1RlJ4fGB14SBe0qqqA0blRgtwh5ciWVApeGNZHv/lFY4drWjiBh57YTA6AD3anT9SNQPDpMXdkwo//QfF98swiQ1Mmxc/xpDyQG1YC6hU9zvFl+uflp3irFKcUkC8vjQmZ45Wij9AwjvjQ6qqMyrGfPf9ZThk/T3rQQTY5OCh/hpqw9sLEvjtD9+h0iyVXpeYbXBVNwsLZzPbziYyU+eSJweaTE7htWf7ees1GgAY9QxD0wzdVJvxGgQg3dZdQH0uWWhAhm5AxzKJeUaPEPagq9W64IiUFBMsNmh39pf4/foNbEY70YJ4NFOxm1Hz0g92H8GIwlk8qFpWOf0Gq6Z0uuYmIizB/bJtvaug6kpU8Rg0ab3Q4sfWXrDKXt//uNf3vHKJ02Fo+eA7g8T8XTV5ltaCYbrpCnEGBBlsY1H+kLss26CNDC1eJlJurT5IbVfkAPFOfXdZWy36Au/0wuVgANR/BiMhbX68H3mjYJX6PbIqKweD4QaZ13k47NX0+yknMdv4GskbSYOlklheHMTc6Hl9cDgzhmJdjzcJ6yH/7z+SJFABQY0YMvTVZA==|920 \ No newline at end of file +}///Qzw1O8CsF/ZbC1kM9XoHSm7tnKfocxiO8/XlWWy2plOBCEfUViQZuBr2XFJsTYIv8j2pz+UZyRV8gbQjZ1Dl1Yq6EAtXmF2KAaV+f4cIghcszffmRZ6Ulf5gkyS0THgTLEtzxO9OkvRxpdFspX47KVE+wQAIWIT8mfx0YSRZobPPlSstuo34+PkIPd81NdMkP9gYYTPHPr+hcpASPtSl8PUaaYRKE8Epf46nywx780sCUf7jCjdtLiNYHVZVgn5BD8jjSNJWWlAPcIjxXFtIF5n4YcVbMavqaxLv/y9P0WZfKrLEmOMky4WYsiy6TVUdjyrjl0abHkx5iUyQd/pnYQMsGqyQyCFGfInxcTNmQGjo2l/Tzesw4xKDYx5mr+E462eTQW21wgkdzqvBL+2RsbDxn+TxvURYqKcawwTPViZx5b+uHfqZP2La7C8nf1anYOw8l/3Hk7M6HtdiLONbe2g4w+KJAh46DOtr96876luKOZlT7x7c34SK5Y1deNmvI9ii71Gt4MqyXyI8Z8FqgClhMSAfX4JDICHZG/KvyK/4MZSKs5qnFMLFro4thiuRnJFMWA9zDHcTzflAUj1yUccnjYvrxYIalORuYZlzjOUxrm23wRKpAIKGyZ4Zop5Xe2IEFyMs9DxdNbaMp6M3F788yo2qRYaexJIGFutocf0egJxYXCoLwPHrzNjORITidCmdE9w9TAZBej7N7D69Qlap+GkNp3oBsY5SbhBdvRB1Znneph1OjV4g3h44gyuZKonLDrvvrvGPdZJFkJJjlTojtgH/CfQ4dCKJ2bSOGa6+1KLvRUiu1Eigx03CncpATZsTfEMhq/Two4bwmev3ty4mLvhnR5E6r6IgAeP4FTQGB9oiOasFB4ISTh6jfLLzUrDEIZ6dkVp5A4N/5C1tw==|920 \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index f3a3dbb9..2897f55c 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -145,7 +145,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "a5cd1de9-2bb1-4bf3-94f3-50fabb93bf06" + "ID": "0c8c9d4c-3222-4c84-b722-ee0e8eeb6f46" }, { "CommandList": [ @@ -157,12 +157,12 @@ "ConfirmText": "您确定要删除吗？" } ], - "ID": "e3cb3e96-15ac-4155-8cd8-733c0996aa94" + "ID": "7bf1a1fc-081b-4e16-bb83-5d7b24f91399" } ] } ], - "ID": "2b4d9864-73e3-45e9-8157-026418fec049" + "ID": "ae0f3331-1aa9-4485-98fe-9f30cbb90361" } ] } @@ -230,4 +230,4 @@ "PaperSize": {}, "Margin": {} } -}//qblduIemzHhviH+KaLuzCS5sN9aqOa14fwYggZM5W3oIfk061i7UHoKD4t92uJm6XLUk/I+Ft7U0Oiji060Me5nWNraIOtIxKs2Ls0VNAgZvaAo3pNz15OToKJuGUVMMdgzCZbRNHwixk6wCsT5ef9g2jDlDhijMgwnsukwC3ieyy1J7j8K/1TqfBpLa4VsO1IaP9jCGEfm9slwPnEg/4WLjt3VmoQbA8paRxX92S5EyFB/eUVOidVpUKwMjBRnl/5p011+u/QwxK+RN4hmDe1uzzVimJGQ+ShuDJdSIShpIG0xQC/qf6/4A1M0S0IOgjsJWNch38Drq4rXIUOEOXd62QnmPVsnOjc3WNHGwY5MRtylyhDHPl808eMaHZda5ORUdII11xr2kWi2z+oJwc20hsaw8Agwt1VV0hVol3nAYX+mY9kICptnjQ652PFRYyoosDHlRopAyAMOxXVpe2LG1zwyS0hNAuE4FnUWA+8Mi00jAz6B5UNAOq7UmtPir+YNSvBEBxyEPefARBlx5K9hkqkf7Ft9cz2jHBFYua3A5c0vKB4QAgBSc8HIQ74hKXXxSCO75mg6iwnjQUNQnJhjL6VUZ8YP437hXGizASLhKBET4VwPS2Ch1Zj0IWzYhXRVMORnOsl45chwakZQe021YhdVDy0x80sVX1CUSxX16nS3vbjxUCMg00kl/+6h40sa71oZyWXWuU+asQz2aaCxlvAE3FhI4LkWVGoYq+TMoSWhxuOzVzIk12xjKnyfnwlJlW8OBIKrmzdVy//c0wFcwA8IzALtSzuZKPbHc4VM+ZKi9LHs1EtbXExy7FtVvGD4dS4fXcx0prBQPI1PpYgp/NPXE4qucK+xeb1qGwot1t6VQehx0aK5AwACwv07aK1k/9WTNfO4QP5HYxUNFSw==|920 \ No newline at end of file +}//5LMI0ZOV4VUuheUhNsnzKjhc13DQLaDgdoqKtkMlxyv8Hq5fFpIlvAqbIvyK0hfy6qmE0mvXN7IJHr6vNIcUH9sBXihn2a2Y8zwSb5+3DlzWJ50V5MIIBdQt06kOr2b5nwcVm909JlI1WfSibKeZ5yCAsPV0aSnLVfnxAZ/uWSdkJXZMdMPcxTAIyphEhJCsclCa1LtSJvEJGgxBcskAOJeuB+iyUkDDtfxpR4dCPssUd9AHiCQPvbo3pbmljybyBCwja9BzZi4WvvpFgMDgORpX7432FOwsW9vbf5jnhYv+bWdua4Yr4KHkzMK/ZWypYDzmeYwY9NkJ2QXziFSHLLSJSqR/9r4iWdxyaK7zq74ZcBspgoCNg//eppvSvHfrrpQtnuyf22s1pC3KA1/eg6zfuwme9MxLflCdyYG9FcyQ+fLd91ayTNyu8zSWAUrPAJFAYirFt6p1/PKGMSH9lleBA7ljm+eRMMJD6PZKDByXvk2iYJA/+qrLG+xxBpKvUokd5HFGimzkYypbqfvdVsplrmTns3Mk650gNZtWBB52eEt3s83xtHMzofCKzlMP56JPyUuk1HxK87Ey+Hv2eCfEtbxUhuNoclm1mizTGuejcNjsTuMPqE+/LCN95UqX1v3jYwaJr7CqVcho6vFqCk53CaPShHVPbW09/dcILeOS2LEerrP0OaVYw4p6XZp+bytrMQ+Wq0s5RIYBh5kav5lCYkcZ01VEayPzsXGCrS4BlZpW7GMPjioQTcKiv0ssb1OXiOmyhJgvaa4pzjrJ1jJRfYjvi6YaFbZArk+sbVI47cInWMRfoAy2zdMKp611rKa3eqrIDAgQXOm9Iveklha3F5csMmnhxfvK97giamtFqLVWCidqo66mtL7p13bSlZEsIiK65i+cZcPVfx9/dw==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-基本信息.json b/Pages/个人中心/个人中心-基本信息.json index 377845f6..f174b426 100644 --- a/Pages/个人中心/个人中心-基本信息.json +++ b/Pages/个人中心/个人中心-基本信息.json @@ -221,40 +221,108 @@ "4,23": "小组", "4,27": "%CurrentUser.小组%" }, - "Formulas": { - "0,34": "IF(C6,H6,G6)" - }, "AttachInfos": { - "0,34": { + "2,5": { "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "更新用户配置", + "Parameters": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!C6" - }, + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('个人中心-基本信息'!C6)" + "SerializeProperty": "='个人中心-基本信息'!母版_当前用户" } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "姓名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!F3" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "负荷", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!F5" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "默认时薪", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Q5" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "邮箱", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!Q3" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='个人中心-基本信息'!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "5108afda-9c58-444b-aac6-b8d9962d1141" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "88b8619e-8717-47bf-9c78-74d1247b2310" } ] } ], - "ToolTip": "收起", - "Size": 18, - "ImagePath": "收起2.svg", - "UseCellForeColor": true - } - }, - "2,5": { - "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -278,6 +346,9 @@ "DefaultValue": "%CurrentUser.FullName%", "type": "text", "resize": "none" + }, + "DataValidationInfo": { + "IgnoreBlank": false } }, "2,16": { @@ -307,11 +378,14 @@ "DefaultValue": "%CurrentUser.Email%", "type": "text", "resize": "none" + }, + "DataValidationInfo": { + "IgnoreBlank": false } }, "2,27": { "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", + "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], "UIPermissions": [ { @@ -325,38 +399,19 @@ "AllowRoles": [ "FGC_Anonymous" ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] } ], "DefaultValue": "%CurrentUser.Role%", - "options": [ - { - "value": "黄金糕", - "label": "黄金糕" - }, - { - "value": "双皮奶", - "label": "双皮奶" - }, - { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" - } - ], + "type": "text", "placeholder": "请选择", - "noDataText": "无数据", - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据" + "resize": "none", + "IsDisabled": true } }, "4,5": { @@ -381,6 +436,7 @@ "min": 0, "max": "24", "step": 1, + "controls": false, "controlsPosition": true } }, @@ -411,7 +467,7 @@ }, "4,27": { "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", + "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], "UIPermissions": [ { @@ -425,80 +481,19 @@ "AllowRoles": [ "FGC_Anonymous" ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] } ], "DefaultValue": "%CurrentUser.小组%", - "options": [ - { - "value": "黄金糕", - "label": "黄金糕" - }, - { - "value": "双皮奶", - "label": "双皮奶" - }, - { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" - } - ], + "type": "text", "placeholder": "请选择", - "noDataText": "无数据", - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据" - } - }, - "5,2": { - "CellType": { - "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", - "Caption": "收起", - "Style": 1, - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!2:5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('个人中心-基本信息'!C6)" - } - } - ] - } - ] - } - }, - "5,6": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "收起", - "Size": 18, - "ImagePath": "收起2.svg", - "UseCellForeColor": true - } - }, - "5,7": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "收起", - "Size": 18, - "ImagePath": "下拉2.svg", - "UseCellForeColor": true + "resize": "none", + "IsDisabled": true } } }, @@ -558,6 +553,9 @@ "FontSize": 13.333333333333332, "Formatter": 9, "HorizontalAlignment": 5 + }, + { + "FontSize": -1.0 } ], "Types": { @@ -647,10 +645,12 @@ "4,27": 4, "4,33": 4, "5,1": 5, - "5,2": 5, - "5,5": 8, - "5,6": 3, - "5,7": 3, + "5,2": 10, + "5,3": 10, + "5,4": 10, + "5,5": 10, + "5,6": 10, + "5,7": 10, "5,8": 8, "5,9": 8, "5,10": 8, @@ -694,9 +694,8 @@ "4,5,1,6", "2,16,1,6", "4,16,1,6", - "2,27,1,6", "4,27,1,6", - "5,2,1,3" + "2,27,1,6" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -733,4 +732,4 @@ "Size": "3,18" } ] -}//5c/8iVVV1x56RkxrYO3eUnivkRboFySX28+jUBfPTw+1RmpvB2wceXRQGNbwiqysWprPuOuSbyjcSqOoWBzWnQY+TxL/+aC90YrMIoqzYmmCa7iU0ZRcqOEL2K2kTrO6QlHPgcpA+UnPmXJD5/e2GNJjPGiRq1iMavK4Rm9u46yxXll6LobAfWjkGZpdqlAMvKpQz8eSFnQ7epZRHIYgpDU5/ZdcPf8+pBUzpqGXA+Wb0nXUh7b4iy15u5jrUbiJ7r4PKcpZAJnRm0eHa2ugK/f+3UuRuCtCSpo64rp2WnNx3SM1Y2YJPP3aQIkvDTuhM1wfXzPRwNMbx9RXcxPs74aIIBHBDXf+3KK0Zj72LQ0e5zqhZvMOQRFliwxbpoQDmjoxBjJV44cPDrE2Amc8/KWVwMf9AHoaPZp/FqKYPlrNTGHWbMqZpuHb/ZyqZrjYK6oLb+fOavVDrp/qgLWXCwPBfu7+wCYTZNsmmHQ3sBRNjLbx5zJnR97D9TznBLgYWYTTkq0xGu6qtN4cWrH+pWS1rSBT5VloC91HgpNLXEROcYMHTxSyVJEpyJEpS2ZAh5NCZYRTqYsNa8FryeoFNT162Ko9hr8HcTtDcP1ndis7CJLtEgZW9xLKDARLP1surmTsnXnUEMNKqmO1DnC9OrUtf1OzcvDftTDcAOhTgvpzzyF+cZr8TnMj8zo1dZ6JtzSJrLjFlPlvupUwse/DYByS3Sf/KTPrQ3wyXfP3Rj1Z3YeZTHyHiNBs1mPNWn0HSYrgsBYYp54M59Tfm4/0vjJwb8pbCPu9whiv6MAffR/7xdIfIlSMVrceNi3xQiGUrkrFNAENgpF2YVJQorPAAQn3NG/Doxa3J+FTbPlMmMAGyuK9oldO0SBsxsBxkYyufrRjeZ/rvmgG3qfz7gTyKg==|920 \ No newline at end of file +}//4PM9O6pGQ+WjMEXf4yvnxhytUYTeVdKmXJiM9NMGCNs7JyjAmbnSF2zyHPYcqdWkB1aate9w5l/nKinE2CjHic5BndixjLz4S9gxAGT+giR0nwezt3FmpO2+SmdtnIkLsv1zm9Jv7ssNCvFRNTEZff+/YkTRRsfzu9OhnmxLIxDSAEHUnZo9u1nQy9aDBdbDj9u6NZwFLelbdAlYzINwWpUOdQkKUZNGDSrgTgoiEwpOE0rPegIVEKQ8Pq3B/QhY2/2x3MmrIXiV0tf7+XhyC8zoupvmtRQ9QXstw9ZWpGp3UAe+sShWFDUOM/faqmDyA1Cib9sH5NMZeeX2RjfZ3p3IxILIIUlhzqZCwvVtWN2kEzplGSRI3VHeijpk6Kg7YIWAKN7EF84kbEz+4NHWNKyb903RuLJ5MUsPcpqjq7OGY9Uu7+bUG5Zgi0zhsKj22jC9zahficROVu66NafT+0wzaUyy3hEE9hhvTx1kVQQRaBItqLALyrXQg51ia5Uug2UEih1G+nc2FGTQ68H5MZVjfy0iOOQbZnsVHZadkdR7scZNqV6jfWn+PTfj/uKK3lfQWx+0lVNXCyjYUkFZ7BOliKwqzAxSmyRC8X2cxESJqelmad9/1oCS+3fWwkMyzXPEKtIA7iCZ7Cmw4JKEuprtj5Ur/9/YLQHNC92cNRmQV83dE0I5UFcB9trI0BH/qzpsOx78AaZi6UlvZaD5LUF/RL3Htbp1Q4z2JkXYiuno9K2Smku06u8ytW/vORVoBVvZMqwZXXHY6hAQU9BILEMjrS4w3nn7Z1HEbUAtSjXApL8NbBIYP5tGNqWQ4Z/FI9ce/0XJJd92JjDoMTJ8P0saJNi6roDk7zcTO+p9GjwpvQKgQaN+Qqq5TDWmJCvsbcC+Ot20kR0TTMw+vg54IA==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-基本信息.rd b/Pages/个人中心/个人中心-基本信息.rd index 1d62c24e..3f03f29f 100644 --- a/Pages/个人中心/个人中心-基本信息.rd +++ b/Pages/个人中心/个人中心-基本信息.rd @@ -1,8 +1,5 @@ { "PageType": 0, "ColumnCount": 36, - "RowCount": 6, - "Formulas": { - "0,34": "IF(C6,H6,G6)" - } + "RowCount": 6 } \ No newline at end of file diff --git a/Pages/个人中心/个人中心-我的收益.json b/Pages/个人中心/个人中心-我的收益.json index 22fd029e..61a26dd4 100644 --- a/Pages/个人中心/个人中心-我的收益.json +++ b/Pages/个人中心/个人中心-我的收益.json @@ -16,18 +16,9 @@ "DesignLengthInPixel": 115.0, "Mode": 1 } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0, - "IsHidden": true - } } }, - "InLogicalVisibleIndexes": [ - 3 - ], - "Count": 4, + "Count": 3, "DefaultSize": 30.0 }, "Cols": { @@ -185,86 +176,14 @@ }, "Values": { "0,1": "我的收益", - "2,1": "%CurrentUser.UserName%", - "3,9": "%CurrentUser.UserName%" - }, - "Formulas": { - "0,31": "IF(B4,H4,G4)" + "2,1": "%CurrentUser.UserName%" }, "AttachInfos": { - "0,31": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-我的收益'!B4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('个人中心-我的收益'!B4)" - } - } - ] - } - ], - "ToolTip": "收起", - "Size": 18, - "ImagePath": "收起2.svg", - "UseCellForeColor": true - } - }, "2,1": { "CellType": { "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", "UserControlPageName": "收益数据横幅" } - }, - "3,1": { - "CellType": { - "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", - "Caption": "收起", - "Style": 1, - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-我的收益'!2:3" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('个人中心-我的收益'!B4)" - } - } - ] - } - ] - } - }, - "3,6": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "收起", - "Size": 18, - "ImagePath": "收起2.svg", - "UseCellForeColor": true - } - }, - "3,7": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "收起", - "Size": 18, - "ImagePath": "下拉2.svg", - "UseCellForeColor": true - } } }, "StyleDatas": { @@ -274,51 +193,13 @@ "Foreground": 0 }, { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Foreground": 2 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Foreground": 3, - "Formatter": 4, - "TextIndent": 10, - "HorizontalAlignment": 5 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Formatter": 6, - "HorizontalAlignment": 7 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Formatter": 8, - "HorizontalAlignment": 7 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "HorizontalAlignment": 7 + "FontSize": -1.0 } ], "Types": { "Strs": [ "black", - "Body", - "Background 1 -25", - "Text 1 50", - "[AUTO]General", - "Right", - "0\"小时\"", - "Center", - " ¥#,##0.00_);[Red] ¥(#,##0.00)" + "Body" ] }, "CellStyles": { @@ -326,24 +207,7 @@ "0,2": 0, "0,31": 1, "1,1": 0, - "1,2": 0, - "3,1": 2, - "3,3": 3, - "3,4": 3, - "3,5": 4, - "3,6": 3, - "3,7": 3, - "3,13": 2, - "3,14": 3, - "3,15": 3, - "3,16": 3, - "3,17": 5, - "3,23": 3, - "3,24": 2, - "3,25": 3, - "3,26": 3, - "3,27": 3, - "3,28": 6 + "1,2": 0 }, "SheetStyle": { "FontFamily": 1, @@ -351,8 +215,6 @@ } }, "Spans": [ - "3,1,1,4", - "3,9,1,4", "2,1,1,31" ], "PageInfo": { @@ -390,4 +252,4 @@ "Size": "3,18" } ] -}//sgSZ0ymV3DcoTQCAHY2IZKJJLgsecOOad/iQq1mS8IvPL2YWE1qv22nRaOulA7zgnBTyj/bCuOTNJ4YdSX0T3sxkQ/F/JPYSrB7ji7Niuq5TWaW20n2QGT+xpWEGZCqnMbUaD/D32PkRzBQm4bWVARc67YzLeRS4C0Ml1twKqPlUYlNeF2CnxwHlWzqM5xCv0226gVIs568QRwJN4hZXNHi8QkKMa0AYCftSC3hKLcXJwcu+jSxiU1/GsayhZb61vr3fE2xE0+VAff6cQ1MduHVe8pHi9jmwRaAYpC2BzOQ+QsUxACB9igmc/NTtAGvg0Xm9SxyPZ6VGwEm7ZsiZO10nHzrYBgkmJjwdN9T7u55X3aihTFGfMIFtgg1dM0evQyXgx3tNd70cvdlbG7G1tJtTKdLwJ+LjcKuU47ghtqmc9Cia8PdPdO4PEuBLjI+UnQ3tyxQ66YyQdQqZlfz2PxWgxHho6eKx3z0aJbl61NCM2Ep1DOOSw9qcuzMPAiAPUZ/m1h3Ndq0Yr9MqwO0P3H5WvZOfmfsUcsP/dw1cqYc58PuPCEW+THGQZtHhV4V8cyqOuodI8i9VmMFlQsBcL2lUNE27LrosiRr4VWTqN8TnQcNiEQnelqiteRGxKxGAc+J9UWEMFonE6NbHH5GtmZqU6EncXkGnXy1kJ362dVtD0nrs0fSSMF1V7iGKYW4aN5XzO4055bLyW2xxynjmIK+Zi05rpnhyAbv7FnE09f5zLL5qAOKIqojqA3GyuyXmM6CADJe2RluwQGbJ9SIKficH3bIUA3eOux37E7amYf0FWrI1hE/0QXRifoNQWyM/ffRnB6V1LOPXbBsji0CS9s7gWENDEy9HVI4XYR5AY/o2okAoZnhdh6x96azY6F0ZXWFX03Lq+FNxlU/jSmcOhg==|920 \ No newline at end of file +}//pBhDtKn9RzIKIk6BKi5baBXFmi2oA6TQaQYKU+M6Q0tbOY875w/Oo2XlmF3IkVMzufpZCn/pGkpqM5yTrhiO/Tu2QY2+s3iRBilOMi389HWvQxF/VRa6UICgSV2MIEe8jvAgZiZHkoVxJdypCeIK15xUkOXAtw2koG93O5S51ZlyrmmNemn9v7sgMHDHbJUfk+ZfW8PUjAHe1QyZyCsz9h+Vu4qT7Mv4Q+D4yhgnZMsroWd4HcFyXsuCM4DpL8V/Jt23d8aueVnozpKrWSJ7x5Zi33+aeYEqnDK/76pjSTTb70PpRhSUUBVtLOMzsUhY50eUavubR4FpPCMBWXJ6IDBT1WpIA4BDVVv7Ewyqbj49N0DUv+4p4+Qac7LnEQVXHxwEf4ZjYGtMKyby1WyYk7xbDBu0HaWNELhMEVfWaHgm5HyV6m2paFWx8BVlYCWG+MpQHWwmyRCQyXTx6TIhGZHG13Fyus/AI9SpgWFBue8fXmF8GfI34z5bQztmfzhFZj6+Zw12WT48Ed8z3BarlkVFIH4Wh4ISGLP4M6HbmvbrDgN5Onv4HXPUiQZ1gLrsWcUIgMNXw2+FdEfQbXOl7Z94cOCV2oBUOS4hNamM2I/1XkwNwkdrQhdJegll9fn9aRvvGPuKw0IjysAPC5m+vwi4DE8oJ466q+gEjbwNFm8Gjsazb5pJi+x35Hv++jJC2yfkg3YQB9Phs4SX4a0nSSJ81zWt1GNzV3/6Y93xTxVnXXFK4hcPpKJigUe/difJUGpKrJFXsLojFl73mbtmLMpG6NreIJrNKTLK94/luqjaa35RZCvsVTuLJpWHG6N5o//bqXkmyPeIAhOi/SmY1cxOUeMwJt0IpOShB74PIr6i492u7hPL+SYURxy53R7jDoVvh1L8ly3oDZ6fjxoVKA==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-我的收益.rd b/Pages/个人中心/个人中心-我的收益.rd index 4785ae0f..29c8d68e 100644 --- a/Pages/个人中心/个人中心-我的收益.rd +++ b/Pages/个人中心/个人中心-我的收益.rd @@ -1,8 +1,5 @@ { "PageType": 0, "ColumnCount": 33, - "RowCount": 4, - "Formulas": { - "0,31": "IF(B4,H4,G4)" - } + "RowCount": 3 } \ No newline at end of file diff --git a/Pages/个人中心/个人中心-收款账户.json b/Pages/个人中心/个人中心-收款账户.json index 01bd6527..e8756694 100644 --- a/Pages/个人中心/个人中心-收款账户.json +++ b/Pages/个人中心/个人中心-收款账户.json @@ -178,68 +178,68 @@ } }, "33": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "34": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "35": { + "34": { "GridRowColumnDefinition": { "DesignLengthInPixel": 16.0 } } }, - "Count": 36, + "Count": 35, "DefaultSize": 32.0 }, "Values": { - "0,1": "收款账户" - }, - "Formulas": { - "0,34": "IF(C4,H4,G4)" + "0,1": "收款账户", + "0,31": "新增账户" }, "AttachInfos": { - "0,34": { + "0,31": { "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-收款账户'!C4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('个人中心-收款账户'!C4)" - } - } - ] + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "账户信息", + "LoadBindingDataOption": 2 } ], - "ToolTip": "收起", - "Size": 18, - "ImagePath": "收起2.svg", - "UseCellForeColor": true + "Text": "新增账户", + "TemplateKey": "链接样式", + "Icon": { + "Name": "Application/001_add_1.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 } }, "2,1": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "9194032cc73440d49d0193bce31608b", + "Command": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "账户信息", + "LoadBindingDataOption": 1 + } + ], + "ParamProperties": { + "ID": "ID", + "用户": "用户", + "账户类型": "账户类型", + "收款人": "收款人", + "帐号": "帐号", + "开户行": "开户行", + "备注": "备注" + } + }, "DataSourceType": 1, "DataSource": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", @@ -316,48 +316,6 @@ "DisplayMode": 2, "TemplateKey": "浅蓝色扁平卡片" } - }, - "3,2": { - "CellType": { - "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", - "Caption": "收起", - "Style": 1, - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-收款账户'!2:3" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('个人中心-收款账户'!C4)" - } - } - ] - } - ] - } - }, - "3,6": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "收起", - "Size": 18, - "ImagePath": "收起2.svg", - "UseCellForeColor": true - } - }, - "3,7": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "收起", - "Size": 18, - "ImagePath": "下拉2.svg", - "UseCellForeColor": true - } } }, "StyleDatas": { @@ -367,41 +325,46 @@ "Foreground": 0 }, { - "Foreground": 1 + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Formatter": 2 }, { - "FontFamily": 2, + "FontFamily": 1, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 3, "TextIndent": 10, "HorizontalAlignment": 4 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 3, - "Formatter": 5, + "Formatter": 2, "TextIndent": 10, - "HorizontalAlignment": 6 + "HorizontalAlignment": 5 }, { - "FontFamily": 2, + "FontSize": -1.0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Formatter": 6, + "HorizontalAlignment": 4 + }, + { + "FontFamily": 1, "FontSize": 13.333333333333332, "Formatter": 7, "HorizontalAlignment": 4 }, { - "FontFamily": 2, - "FontSize": 13.333333333333332 - }, - { - "FontFamily": 2, - "FontSize": 13.333333333333332, - "Formatter": 8, - "HorizontalAlignment": 4 - }, - { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "HorizontalAlignment": 4 } @@ -409,11 +372,10 @@ "Types": { "Strs": [ "black", - "Background 1 -25", "Body", + "[AUTO]General", "Text 1 50", "Center", - "[AUTO]General", "Right", "0\"小时\"", " ¥#,##0.00_);[Red] ¥(#,##0.00)" @@ -421,48 +383,51 @@ }, "CellStyles": { "0,1": 0, - "0,34": 1, - "2,1": 2, - "3,1": 3, - "3,2": 3, - "3,5": 4, + "0,31": 1, + "0,32": 2, + "0,33": 2, + "2,1": 3, + "3,1": 4, + "3,2": 5, + "3,3": 5, + "3,4": 5, + "3,5": 5, "3,6": 5, "3,7": 5, - "3,8": 4, - "3,9": 4, - "3,10": 4, - "3,11": 5, - "3,12": 3, - "3,13": 3, - "3,14": 3, - "3,15": 3, - "3,16": 6, - "3,17": 6, - "3,18": 6, - "3,19": 6, - "3,20": 6, - "3,21": 6, - "3,22": 5, - "3,23": 3, - "3,24": 3, - "3,25": 3, - "3,26": 3, - "3,27": 7, - "3,28": 7, - "3,29": 7, - "3,30": 7, - "3,31": 7, - "3,32": 7, - "3,33": 7 + "3,8": 5, + "3,9": 6, + "3,10": 6, + "3,11": 2, + "3,12": 4, + "3,13": 4, + "3,14": 4, + "3,15": 4, + "3,16": 7, + "3,17": 7, + "3,18": 7, + "3,19": 7, + "3,20": 7, + "3,21": 7, + "3,22": 2, + "3,23": 4, + "3,24": 4, + "3,25": 4, + "3,26": 4, + "3,27": 8, + "3,28": 8, + "3,29": 8, + "3,30": 8, + "3,31": 8, + "3,32": 8 }, "SheetStyle": { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332 } }, "Spans": [ - "3,2,1,3", - "2,1,1,34" + "2,1,1,33", + "0,31,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -499,4 +464,4 @@ "Size": "3,18" } ] -}//I0rF7W7+n++N8Pu/bTRQPQQhi6trF3yOUqQelxoXH/LSn1pEp5Y6Q2MB2qvT1ASK2aR5x36MKpIhCAfSSn5UKuiw9Jkx65OBvJAmsfJ3KVsBu22z2wRbU9ZEbv8uLlyNLY1gYJWgXp1xY5jrI8tsifeJEQHl9x5+PNC5ij7sEGJWL7CqwUME1WUzxcB2gDOpJ1MtgqNxRvXOS9310ueTJpxBOiW80v9mwC/yjFOPbB1wwsfymi8zG9gpgf9QjYINYK9dANJfHFhTXooMRbETFD6ah1ufnoKcrgOm6C2m+to1TdsfcjZwZLb09mTGJssFMGnSXqxrXVA8SJ0fpPoNPLMR6KrmBf0JNZ7yGHbKbN6mKGt41/PyvKz0D88qgyBKXLJjV/V7gfuXC7T8Mrxo9/R1MZMHBVGx9ReHw+Isswxw4Pl2dlst0kkoFDO6L5/REmKSjsIOsm9A1Y3d51xOBL9wo6Fgx1dx0/zpXc8kjc24+R98duR/fNZSzkUHrNMoCMhDwIZD2FULdRkirbgAzml+Z++ZIEf5ds48hLbynxIJGO9lfgOgX8EqFsNw4CG79nvYGTrg0PNnhVFtjlDlidCl49EiR5OQwv6bPVigO+aXWjEFAtL/KEqXzXF7Xi+LQu0mF7xCYAJRRcr61ZQzHiP/WOKr7T5nZ5D9MWIr0Mb0dLGWtdg5ByVHpwxtsGHgM8MMrn9tJ3otcGUlqKvQ91/89RQnbD5MtqvRsZi3Sor9Csm/05geqyG3U6WpFPKHlE+lzWqtU8XkWfuzCe19HeUZFRysV9E30uUvO2U5thr9kAPifrBw4HxMxpEhR724ZO9r+F7u93v0b+qlcQiGOZEwl3czGi26Ih/L3vbdppp6gnvCwZJ/LirvQJI10Xknlkz8CDR+x0+JJZ3J6N7ryw==|920 \ No newline at end of file +}//KtuNBSkKgeudIvljCETDBQiIl6BjqEZTEZpMk7MbcwWurxgUnl4GUiNsK7bulqPM7HBG+cpjaWV+xGAXRJiivKPl7UX2IqNv98fQMtx7IYWNc4ntOI5eSEYYnspBDlwsFizIltnEaDM/Q+TcFQIVcj9Asm++I1vbIJjoaJFK/Dp5Aw/F5J3A4Q++rFeA3gGKGHvsWs4QXE1fPiw0jzMi2WUiijLbDb6tmFxNE+qT7ddqJb5HTUiK2VHgXsBvWnFoYLt2+8Nc6m2X/olvY9/QeBN+h/qChMvnrR6w30Q7VSGnWJKRoIDGd6UuHJ/r8JmbI5l1qDWXWOr//ex2UWADjn1EnkRt/OwvQo5RpKzEbWALcDSkmeBPsjldBCGYA3jiiKc4khOAaH003BjO8gIi45egdtcDx3SSQeMl0EsgO/jgW9use7h6W/EAOd0P54GcZcy0IYqumYyk5SYrtU751xNpaAmxJqiLYxO5MLWzwkTZZL7sAq3omFlgd1iaL23XR5IuUWB44wYW7laGb9njS9ikLuR1dHipecThb5qsgG6JJOsoSXGigrsazWmGPlfUqDqqXBCiTgVfUiU9BvJdTUjp6f6O28UdNAeaXXkjA4b1xYODgsEZf1/xSzQE+Zavz+AePkv/flvpWxPwXbP4+YbZrSH1YSN7NbK6n/QmmE8VEhVYLkKjeMwNfHxBJwnfUaJBNuEHwJQGUrRh1PLHxcvi/sNlJL2MK4v/riTR65QXhYrE801x4mVSGU6bRWaOtW30YQkAUrBpiyVubvNX6UzTfX9Hi0+hAa1IYpj/ZZjHAhW+oiTQxEcWuTgC04Te/ykX+stfh13xe18Q5Fy7WLgMud66MUHIoL2N2QH6PFEt5AqIvKb6rjOUIt++9KY7QvwR8L9htJJOqbuh4yoc0w==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-收款账户.rd b/Pages/个人中心/个人中心-收款账户.rd index 2ea5afeb..230136a7 100644 --- a/Pages/个人中心/个人中心-收款账户.rd +++ b/Pages/个人中心/个人中心-收款账户.rd @@ -1,8 +1,5 @@ { "PageType": 0, - "ColumnCount": 36, - "RowCount": 4, - "Formulas": { - "0,34": "IF(C4,H4,G4)" - } + "ColumnCount": 35, + "RowCount": 4 } \ No newline at end of file diff --git a/Pages/个人中心/个人中心.json b/Pages/个人中心/个人中心.json index dc16288f..86329fb0 100644 --- a/Pages/个人中心/个人中心.json +++ b/Pages/个人中心/个人中心.json @@ -327,6 +327,12 @@ "8,15": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "FGC_修改密码" + } + ], "Text": "修改密码", "TemplateKey": "_RS_Information3", "Icon": { @@ -341,6 +347,12 @@ "8,19": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "收益中心" + } + ], "Text": "收益中心", "TemplateKey": "_RS_Information3", "Icon": { @@ -655,4 +667,4 @@ "Size": "1137,332" } ] -}//nTWC6xms9N3jRNieOiKxInxKYAgBGHnM63dNE0MzJKEciV6nhwoQ3tRpn1ZaXKy9GduJ8tWLTWQNPAToncOiSq8LQmwpPFc7jbHbxfoWQf59kEk5kEHP5trNGM9YW+0qYrX8wYAEmlfupsyXbIVMEjgPH8CrxbFzZJV7lz0mWsE8NjluxBuPxCs0SGyWo2pwC4HQzPYb2eP9L6/zCffYBLuDGkjqh7UrFkQqsQ9ZU2gsveHYjzQYPXYB1mzIGdZdLyljDuK0YsS8c65bYYO3Qt1t66q4xqbeJQHBZbfPC/yRkuxbu/OPYlAmtJMMo71cIEkV8r7pzCLoeRjjTNUqkmkkt2Le5Y7fyBcsrDd0QT1zxMY3ih0Y7w751GN6TvZWMpr0H7p84GRBvhRWD7BYayZb+0LYQ+IdMe8i3Pn5exQWTXMqOCKbKau6UFuNPd/e7GZZEeZqR1bhjKf5W28RfIEcbJuIS7RD5nPAU/n5fKJQcSlssxCI3ZoC/5Mty5BR9ppJQnoXFoRlEeAimFk9nt05TFHCU4Om767fvxI3y7g3lt3o252tgS8psZMVO0nFEU/T6wpcW3Xudzn+zxoQgeDZtX+Twwbc13cUkKCaVikyT3o6E4R5AjIRyQa3JfxdxLOxCxCr9JkYPh/21MjKXtDHdu6o67tdhwjLgaaKY3EFaDPVxwL7ZWrx3+sK+hNGXGW7hUAzJjXzxYMKlNXYKjCsOzAs8tMgAEo8xfHo9haEN1xZfhkq3fJ80IMbcp559kwhEfQGXJ8IVzMXEGcyPL2aV2YAZuRXWZmpUQ0/F0j5/RckRQLVAg4rZC3QieiPNPJ4h/n1k05ug0oVus0MYK3xOy7GyobX9QJjDoNz3/YYWTJ357OMkZN/EIPVFgY0EIDRlHbUo6XEChrDWG7ZmQ==|920 \ No newline at end of file +}//ZT2uARYqg8Urk7zi+pWZSFLSF0xfs1QCN0q7e6SidhceJVr/Ed55Ss9isFUxrVCFA7abr6771eekDSYb7V9qtisZ+A7wENmi8CDmzNot33hSfB0a9wQ6x8mf/FTl+/UdtHbJbqZ1+wBzmjgQqniSvUIngKPglXMLPNdZl4z/T5RjlI+qy8efdIQqhHDGSR3dXRfUVq1Iz93Ia2+47cAF1zisXyugFDmKc5b3QSglB8ADz32BXlqir7+JzufJlEJ0lF2fDBu/9k6E/LfmkQukquGivkoD63c5XpTsEH5hYbcPawv2opq3N8Gdf6kIhCD+IsrTd2gOQv/vgR/xBBs2Q6FLn3sfvveQpxADQJvFrjlwlNyDchxfYAWQeunREojeybRb6IIk3bACB4LIuETau+urtmJpAYE3DWLZALSWWrcnWryo5DQKG5mdWPCIjVyFv59wzDu5gm7h1+AtSWAvcuhaoYuE5EThkHGqAfWugWdVeJjhJVoaYElapr4PWdgwltv8QXcmlTYAYHYrag/gIq89yPif8u6GeAiW1PP3mMSejkxih18KTCwSckrv07dwAkWqtIdDQDoyT1z4HRi75xp6zKZRInHjnEzc3cjGvo6o23fZcnd009bGkUrmmHhW/gm7eMXUvBBEXZp6haSXUEKDbU9tD1S1VTy+tSmVHHrNJ00oK36pSBSx8r2DK0bTq2GfmWSGBpetnGnhP395bXykKjQVgb2sIQd6yueGN2aCR3Su+YFimr/JDn6eUjqc3VelJfBmPrqivrDjbGY9UqpBb4/ldxlGgjFlipeMCMLPN1b0H4v9KxmLP/qDZ2Q4kdePjnBpXMu8sY/9TuxF93fkCxOetkz2XZhaSM6iBjPcmCz1wGfY/xwDoGeC/jXTyWKiHmhQQqSeim0+/rVHtQ==|920 \ No newline at end of file diff --git a/Pages/个人中心/账户信息.json b/Pages/个人中心/账户信息.json new file mode 100644 index 00000000..86dbcb1b --- /dev/null +++ b/Pages/个人中心/账户信息.json @@ -0,0 +1,657 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "InLogicalVisibleIndexes": [ + 18 + ], + "Count": 19, + "DefaultSize": 35.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 18, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "账户类型", + "2,1": "银行卡", + "4,1": "收款人", + "7,1": "账号", + "10,1": "开户行", + "13,1": "备注", + "16,1": "关闭", + "16,13": "保存", + "18,1": "%CurrentUser.UserName%" + }, + "AttachInfos": { + "2,1": { + "BindingInfo": { + "TableName": "收款账户信息表", + "ColumnName": "账户类型", + "GUID": "79af9786-45e9-47d8-8616-d1ad4e1b6aaa" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "银行卡", + "options": [ + { + "value": "银行卡", + "label": "银行卡" + } + ], + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "5,1": { + "BindingInfo": { + "TableName": "收款账户信息表", + "ColumnName": "收款人", + "GUID": "97e07734-1920-49c6-9b09-8e33f1fbf362" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "maxlength": "24", + "showWordLimit": true, + "placeholder": "请输入", + "resize": "none" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "8,1": { + "BindingInfo": { + "TableName": "收款账户信息表", + "ColumnName": "帐号", + "GUID": "d229e5c8-bc49-4bde-a8fd-8814b181e75d" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "maxlength": "32", + "showWordLimit": true, + "placeholder": "请输入", + "resize": "none" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "11,1": { + "BindingInfo": { + "TableName": "收款账户信息表", + "ColumnName": "开户行", + "GUID": "1c347039-910f-4365-8637-f3444940d409" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "maxlength": "32", + "showWordLimit": true, + "placeholder": "请输入", + "resize": "none" + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "14,1": { + "BindingInfo": { + "TableName": "收款账户信息表", + "ColumnName": "备注", + "GUID": "ff91f784-5c60-4757-af8d-bfce50a665c2" + }, + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "maxlength": "128", + "showWordLimit": true, + "placeholder": "请输入", + "resize": "none" + } + }, + "16,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "关闭", + "TemplateKey": "_RS_Information3" + } + }, + "16,13": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "收款账户信息表", + "ColumnName": "ID", + "GUID": "d7b79e61-588d-44dc-8fd5-926f154a7307" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "收款账户信息表", + "UpdateType": "add", + "ShowConfirm": false + } + ], + "ID": "68d571af-4788-4ce3-9e4f-c9402bca67f9" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "收款账户信息表", + "ShowConfirm": false + } + ], + "ID": "ac561d53-7428-4e44-a057-47276039319f" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "保存成功" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "Text": "保存", + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "Application/067_save_4.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "18,1": { + "BindingInfo": { + "TableName": "收款账户信息表", + "ColumnName": "用户", + "GUID": "208c8e64-c05d-43c1-846f-4b31f002d399" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General" + ] + }, + "CellStyles": { + "4,0": 0, + "4,1": 1, + "4,2": 0, + "4,3": 0, + "4,4": 0, + "4,5": 0, + "4,6": 0, + "4,7": 0, + "4,8": 0, + "4,9": 0, + "4,10": 0, + "4,11": 0, + "4,12": 0, + "4,13": 0, + "4,14": 0, + "4,15": 0, + "4,16": 0, + "4,17": 0, + "5,0": 0, + "5,1": 0, + "5,17": 0, + "6,0": 0, + "6,1": 0, + "6,2": 0, + "6,3": 0, + "6,4": 0, + "6,5": 0, + "6,6": 0, + "6,7": 0, + "6,8": 0, + "6,9": 0, + "6,10": 0, + "6,11": 0, + "6,12": 0, + "6,13": 0, + "6,14": 0, + "6,15": 0, + "6,16": 0, + "6,17": 0, + "7,0": 0, + "7,1": 1, + "7,2": 0, + "7,3": 0, + "7,4": 0, + "7,5": 0, + "7,6": 0, + "7,7": 0, + "7,8": 0, + "7,9": 0, + "7,10": 0, + "7,11": 0, + "7,12": 0, + "7,13": 0, + "7,14": 0, + "7,15": 0, + "7,16": 0, + "7,17": 0, + "8,0": 0, + "8,1": 0, + "8,17": 0, + "9,0": 0, + "9,1": 0, + "9,2": 0, + "9,3": 0, + "9,4": 0, + "9,5": 0, + "9,6": 0, + "9,7": 0, + "9,8": 0, + "9,9": 0, + "9,10": 0, + "9,11": 0, + "9,12": 0, + "9,13": 0, + "9,14": 0, + "9,15": 0, + "9,16": 0, + "9,17": 0, + "10,0": 0, + "10,1": 1, + "10,2": 0, + "10,3": 0, + "10,4": 0, + "10,5": 0, + "10,6": 0, + "10,7": 0, + "10,8": 0, + "10,9": 0, + "10,10": 0, + "10,11": 0, + "10,12": 0, + "10,13": 0, + "10,14": 0, + "10,15": 0, + "10,16": 0, + "10,17": 0, + "11,0": 0, + "11,1": 0, + "11,17": 0, + "12,0": 0, + "12,1": 0, + "12,2": 0, + "12,3": 0, + "12,4": 0, + "12,5": 0, + "12,6": 0, + "12,7": 0, + "12,8": 0, + "12,9": 0, + "12,10": 0, + "12,11": 0, + "12,12": 0, + "12,13": 0, + "12,14": 0, + "12,15": 0, + "12,16": 0, + "12,17": 0, + "13,0": 0, + "13,1": 1, + "13,2": 0, + "13,3": 0, + "13,4": 0, + "13,5": 0, + "13,6": 0, + "13,7": 0, + "13,8": 0, + "13,9": 0, + "13,10": 0, + "13,11": 0, + "13,12": 0, + "13,13": 0, + "13,14": 0, + "13,15": 0, + "13,16": 0, + "13,17": 0, + "14,0": 0, + "14,1": 0, + "14,17": 0 + }, + "SheetStyle": { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "16,13,1,4", + "16,1,1,4", + "18,1,1,3", + "2,1,1,16", + "5,1,1,16", + "8,1,1,16", + "11,1,1,16", + "14,1,1,16" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//P+m10i7hXaNa6eVc68fpqtsBaDOBJWOFuo2ZbOB5ZuSY0wqUxNqLQRjh4FsPijPVKAOngqZDq/bB2vk7gjbE636GMim2R6nJ1fOmiarSuJ8VNDtaTgxWpypctgC2p6f3Z2eZImRAlKsgfDrX6sPEgPuML1pXC0il8NcE0SfdVzhrkFw70umfZqDjWp91yA5TeW7gUFlI1LrfACIfNpmK+58S+Q5hH7lJZqPLAqQMwdwgZc2P6ORBbYpLuBQy9lOn3vpMrYqMOaMTwtvyfLEGznY2Y6KuxYMWUVxSLUnTSJr3BHLpXqb3jHNKf0i1JiaVJmwO+FvBv9uzBH+uCOfmoIrLXytPHLLUNEU8B4VLUdUS3rtmNR9I5hqe4Ap9Yi1jUaJTC3CXIqseJXR3ORjl2j13FPCdSOMOtbPO57rwf//I5C8G8mItVzUuXLT4fpljM14c0T7TNd9i42M0xjaYINXDj6NP93hIR6S/RTZ36h7rCp20jc8KsTCCNvSv3DQylsdUwGqXMYOj1gFkKbs22Ptw1hDaPxGwXeWVl0JL6/cRfB+PeAP4AnWJVzgKUiNcuPJRt9PA5CjWbU9VZjRXCb9dprXb1cLs4mH8gQOm6oDLBPYYRPU8iWk0YAacCf2NIFfwwQ27jz6RuhLP31Xm/FSbff0jT83/aAAjK61BUJvW3WTVN/cKtfPbly7ejgNDnPvyMI6Rbp9I1dApN0ia4rdewYZ2WH61nhKowktB5K+AACx49Ixw9P5hKnkEhK8mPs8Ha5aPZXmW09ZpSfGWSDTuqLXPLLZq+ZDgbIjdQ4Jr8lHTytt09r9P+ytX8hqYkS0LcrXMpMaOcpF2b7daGQo/yiXyMxmKfn0DGwzlkoswR5teUZoqeYxuf8kIPW9VP55DWoPmUfzOYcgtVqUTMA==|920 \ No newline at end of file diff --git a/Pages/个人中心/账户信息.rd b/Pages/个人中心/账户信息.rd new file mode 100644 index 00000000..edecf1e5 --- /dev/null +++ b/Pages/个人中心/账户信息.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 18, + "RowCount": 19 +} \ No newline at end of file diff --git a/Pages/任务/任务-任务信息.json b/Pages/任务/任务-任务信息.json index c1778fe1..77b8543a 100644 --- a/Pages/任务/任务-任务信息.json +++ b/Pages/任务/任务-任务信息.json @@ -1,14 +1,14 @@ { "Rows": { "RowColumnAttachedInfos": { - "1": { + "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 10.0 } }, "3": { @@ -18,42 +18,56 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 1 + "DesignLengthInPixel": 32.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 1 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 1 } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } } }, "InLogicalVisibleIndexes": [ - 0, - 10 + 13 ], - "Count": 11, + "Count": 14, "DefaultSize": 32.0 }, "Cols": { @@ -150,17 +164,20 @@ "DefaultSize": 32.0 }, "Values": { - "0,1": "任务说明", - "1,1": "版本", - "1,10": "添加", - "3,1": "任务说明", - "3,2": "编辑", - "7,1": "备注", - "7,2": "编辑", - "10,18": 0 + "1,1": "任务说明", + "3,1": "版本", + "3,10": "添加", + "5,1": "任务说明", + "5,2": "编辑", + "9,1": "备注", + "9,2": "编辑", + "13,18": 0 + }, + "Formulas": { + "1,20": "IF(折叠关联资源,上箭头,下箭头)" }, "AttachInfos": { - "0,1": { + "1,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -190,7 +207,7 @@ "IconSize": 14.0 } }, - "0,20": { + "1,20": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -200,9 +217,12 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!S11" + "SerializeProperty": "='任务-任务信息'!折叠任务说明" }, - "Value": "0" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-任务信息'!折叠任务说明)" + } } ] } @@ -213,7 +233,7 @@ "UseCellForeColor": true } }, - "1,2": { + "3,2": { "BindingInfo": { "TableName": "任务表", "ColumnName": "版本", @@ -305,7 +325,7 @@ "noMatchText": "无匹配数据" } }, - "1,10": { + "3,10": { "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ @@ -334,13 +354,13 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!C2" + "SerializeProperty": "='任务-任务信息'!C4" }, "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "ReloadBindingItems" } ], - "ID": "141bd7a6-1c79-443c-9128-dd3449952e19" + "ID": "8104c097-e5b7-4f85-b225-e716d2ff247c" } ] } @@ -369,30 +389,7 @@ "TemplateKey": "_RS_Main" } }, - "1,20": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!S11" - }, - "Value": "1" - } - ] - } - ], - "ToolTip": "折叠", - "Size": 18, - "ImagePath": "收起2.svg", - "UseCellForeColor": true - } - }, - "3,2": { + "5,2": { "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ @@ -424,7 +421,7 @@ "ShowConfirm": false } ], - "ID": "4a81aa25-39c1-4b3e-9d53-1b6548e587ea" + "ID": "96a8307b-d0c9-4423-af3f-b7f5b0c1dd79" } ] } @@ -439,7 +436,7 @@ { "Source": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!C5" + "SerializeProperty": "='任务-任务信息'!C7" }, "TargetCell": { "SerializeProperty": "=MD编辑器!编辑器" @@ -453,7 +450,7 @@ "TemplateKey": "_RS_Main" } }, - "4,2": { + "6,2": { "BindingInfo": { "TableName": "任务表", "ColumnName": "任务说明", @@ -480,7 +477,7 @@ "ReadOnly": true } }, - "7,2": { + "9,2": { "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ @@ -512,7 +509,7 @@ "ShowConfirm": false } ], - "ID": "1df62898-ee93-4007-81dd-caea6e9cd8ae" + "ID": "36f614d7-9db2-4ba2-b8ab-3c85b26c8fef" } ] } @@ -527,7 +524,7 @@ { "Source": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!C9" + "SerializeProperty": "='任务-任务信息'!C11" }, "TargetCell": { "SerializeProperty": "=MD编辑器!编辑器" @@ -541,7 +538,7 @@ "TemplateKey": "_RS_Main" } }, - "8,2": { + "10,2": { "BindingInfo": { "TableName": "任务表", "ColumnName": "备注", @@ -568,7 +565,7 @@ "ReadOnly": true } }, - "10,18": { + "13,18": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "折叠", @@ -580,21 +577,11 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!2:10" + "SerializeProperty": "='任务-任务信息'!4:13" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-任务信息'!S11)" - } - }, - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!1:1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!S11" + "SerializeProperty": "=NOT('任务-任务信息'!折叠任务说明)" } } ] @@ -666,63 +653,103 @@ ] }, "CellStyles": { - "0,1": 0, - "0,20": 1, - "1,10": 2, + "1,1": 0, "1,20": 1, - "3,1": 3, - "3,2": 4, - "4,1": 3, - "4,2": 5, + "2,1": 0, + "2,2": 0, + "2,3": 0, + "2,4": 0, + "2,5": 0, + "2,6": 0, + "2,7": 0, + "2,8": 0, + "2,9": 0, + "2,10": 0, + "2,11": 0, + "2,12": 0, + "2,13": 0, + "2,14": 0, + "2,15": 0, + "2,16": 0, + "2,17": 0, + "2,18": 0, + "2,20": 1, + "3,10": 2, + "3,20": 1, "5,1": 3, - "6,0": 5, - "6,1": 6, + "5,2": 4, + "6,1": 3, "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, - "7,0": 5, "7,1": 3, - "7,2": 7, "8,0": 5, - "8,1": 3, + "8,1": 6, "8,2": 5, + "8,3": 5, + "8,4": 5, + "8,5": 5, + "8,6": 5, + "8,7": 5, + "8,8": 5, + "8,9": 5, + "8,10": 5, + "8,11": 5, + "8,12": 5, + "8,13": 5, + "8,14": 5, + "8,15": 5, + "8,16": 5, + "8,17": 5, + "8,18": 5, + "8,19": 5, + "8,20": 5, "9,0": 5, "9,1": 3, + "9,2": 7, "10,0": 5, "10,1": 3, - "10,2": 8, - "10,3": 8, - "10,4": 8, - "10,5": 8, - "10,6": 8, - "10,7": 8, - "10,8": 8, - "10,9": 8, - "10,10": 8, - "10,11": 8, - "10,12": 8, - "10,13": 5, - "10,14": 5, - "10,15": 5, - "10,16": 5, - "10,17": 5, - "10,18": 5 + "10,2": 5, + "11,0": 5, + "11,1": 3, + "12,0": 5, + "12,1": 3, + "12,2": 5, + "12,3": 5, + "12,4": 5, + "12,5": 5, + "12,6": 5, + "12,7": 5, + "12,8": 5, + "12,9": 5, + "12,10": 5, + "12,11": 5, + "12,12": 5, + "12,13": 5, + "12,14": 5, + "12,15": 5, + "12,16": 5, + "12,17": 5, + "12,18": 5, + "12,19": 5, + "12,20": 5, + "13,0": 5, + "13,1": 3, + "13,2": 8, + "13,3": 8, + "13,4": 8, + "13,5": 8, + "13,6": 8, + "13,7": 8, + "13,8": 8, + "13,9": 8, + "13,10": 8, + "13,11": 8, + "13,12": 8, + "13,13": 5, + "13,14": 5, + "13,15": 5, + "13,16": 5, + "13,17": 5, + "13,18": 5 }, "ColStyles": { "1": 9 @@ -733,14 +760,14 @@ } }, "Spans": [ - "3,2,1,3", - "7,2,1,3", - "10,18,1,3", - "1,2,1,8", - "4,2,2,19", - "8,2,2,19", - "0,1,1,18", - "1,10,1,2" + "5,2,1,3", + "9,2,1,3", + "13,18,1,3", + "3,2,1,8", + "6,2,2,19", + "10,2,2,19", + "3,10,1,2", + "1,1,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -766,10 +793,39 @@ "PaperSize": {}, "Margin": {} }, + "BackgroundPictures": [ + { + "FitToBrowserWidth": true, + "Name": "c63e1814-5f80-4aaa-b8a6-2fefcb949974.png", + "DisplayName": "背景图1", + "PictureCommands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!折叠任务说明" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-任务信息'!折叠任务说明)" + } + } + ] + } + ], + "StyleInfo": { + "Fill": "Background 1 0" + }, + "IsAutomaticFill": false, + "Size": "769,52" + } + ], "CustomNames": [ { "Name": "折叠任务说明", - "Formula": "'任务-任务信息'!$S$11" + "Formula": "'任务-任务信息'!$S$14" } ] -}//vPcuOzOj6Npj2Y/uDgRghXwAjcmpn4x4WZzIFQsKqwHOqUgdCW97Ot6GOS0ABOJUK0W2NwovkMKQ78eF/33xFu0GDJWKktlt+vmJmKnNrLrDBgsoiYJqacsSEU2OFKZpHl/qE8ULqcbaCumfnZRoMv6puzHSaz9/nOOyrNLpDQKz0cPlpfWMESRm+c+9kjAGbhZBM4ukvQ+Xj74cPF/sRP9dlSAsinT0iRAdzKeOxAjlAzn6cP40FyA8x/6qIRPY3fpaEx7ByA/eJY8/ao49Egw+Y+Vy22ixtBSWmkZyKBCQtszk8BP4OaIhjgwXTy7ZR6iUq3SsJGy/Wg7LGEoUaFaR5+xxitBrxFIbr+WZgo5XxMHZVY67cwMCN1kT7TRDqo6mUxI9cYUFamjjUOFj+w+rKLyYD6HXWoH31N14ukxmnOvMThg5LZY9pfiBF04i7AD7OBfbRqQ8H+kwHTEFsrXAlraTsm8kBB7yDyzMmJwNevHwOiuO6/jiw4yziIKursspknSgRe1xgZQCnjVwJB6X90GId+3/KvygkzD6iv4MJHYDOGBabgL6Xqz4BSmcDqo4OuEPk6oCvKUmYatf7KoHiSmKY9YbNq8bmjKmdAUSYJSmWYHSYxeYK2F2k3P7TDYk47c2inu022QV5pAx0pJBYic+9dqY8VaRQ5+RiEqUvU+McqyLdfbslISswviIAeEMncmwFEtF97u7fM7E3fZKrIrlPT5pB98VRifhi/SjcqOEiWSz6Oo3siV0YFQg1WWLgiDPH6vx3W6m2bIew3fS86ajdOxsbu7FNtXFsDBf3XbCjlWZCgoVv1MFlNjjQxhrwWTp/kKVCNEVbUFXGqsI9FkTmKzbjVVkcyfBBdl5Wq27h0fXMToyX2mO//TPxt2bFK/PGPlDVJxOHyYNfA==|920 \ No newline at end of file +}//pOhoATrvBU0L7O7fSacdxXjMdRVHDsrNagi0s41TuSbVn7rTXq1RJxTIv1w1VnHficDRYy3BZz0HhKS3kh4YcgGDiyVTsMgPZRp3XLS3gK/zapBs3OCmIudT9kv1gqPAI13oL41bAItuNUdNpFvDK7WMBE3v1dhoVu7xDIflNbbRV1xRqRvN9O4RXe/PFNr1QGpb56R3rv0Go7anXBgcMHpdekugeJGFCS+lnlw39QE3h9tntLmliWNyj+lIDrTkC0T2qyyRHm0judorjydIZQJ7U7EhePeuL6QGkJAar5I1fV3WlLAVqQWLDsYiMhovLfBjjqVwvkzFlJkWJoajNCoM484F/IIZ30RES8rxxs1QUlmk37X1YQsT9n95AqoD4aopZRTLyEAnkj7h2GROY1QwepqlfwNsedfSzfrPGDlEFYhN2YwsvwNTGzN0xlnYYYAP1txrTFy4KhBT9CrpvqicXpFNvSu36tOQqYtNkoZLYG7gus338RJG/J3O2R6m3rDScvDI0S2XWYa6GinxJ7mRP/vod+JY2ArbCjvcUMAd5ax9UPJq4UoQ/hWV+ix3//sA/hRGJRjtWNIOdfks+wMLWgtF7iiHqEEd1xTZkmhXL9lDbTZqvYFj2su0pHVnxwPp71gGkmxyjxpXNhQDnigalnfvOlcGQFdozlwqszRxYxlux4YKD5aey2frzpCYMmHb423B+QWoGlB1pOCPKp8GM1AbdNy9ITYn4h9ucLHARJyYro9q+szF49z5LrwgGP7rUIDm11z8Gv8Ck78Bl8Re8E7/BmS+HlNfworx7HHOiiSvNdiYKEOEodLONOgMoNUOGe9XJ7IFn+rZFfF+tsGPXpDtnRsznnzca5tMEPtYyHB9Hx5NoKisngZe94vAujkR6qiA0bI4xDEWplyU/A==|920 \ No newline at end of file diff --git a/Pages/任务/任务-任务信息.rd b/Pages/任务/任务-任务信息.rd index 4a9864b1..9fe86cfb 100644 --- a/Pages/任务/任务-任务信息.rd +++ b/Pages/任务/任务-任务信息.rd @@ -1,11 +1,14 @@ { "PageType": 0, "ColumnCount": 21, - "RowCount": 11, + "RowCount": 14, + "Formulas": { + "1,20": "IF(折叠关联资源,上箭头,下箭头)" + }, "CustomNames": [ { "Name": "折叠任务说明", - "Formula": "'任务-任务信息'!$S$11" + "Formula": "'任务-任务信息'!$S$14" } ] } \ No newline at end of file diff --git a/Pages/任务/任务-关联资源.json b/Pages/任务/任务-关联资源.json index 22065f6b..7550b841 100644 --- a/Pages/任务/任务-关联资源.json +++ b/Pages/任务/任务-关联资源.json @@ -3,29 +3,39 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true + "DesignLengthInPixel": 32.0 } }, "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 136.0, "IsHidden": true } }, - "3": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 136.0, "Mode": 1, "IsHidden": true } }, - "4": { + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0, + "IsHidden": true + } + }, + "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -33,13 +43,13 @@ } }, "InLogicalVisibleIndexes": [ - 1, - 2, 3, - 4 + 4, + 5, + 6 ], - "Count": 5, - "DefaultSize": 32.0 + "Count": 7, + "DefaultSize": 10.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -125,12 +135,14 @@ "DefaultSize": 32.0 }, "Values": { - "0,1": "关联资源", "1,1": "关联资源", - "4,16": 1 + "6,16": 1 + }, + "Formulas": { + "1,20": "IF(折叠关联资源,上箭头,下箭头)" }, "AttachInfos": { - "0,1": { + "1,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -160,28 +172,6 @@ "IconSize": 14.0 } }, - "0,20": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-关联资源'!Q5" - }, - "Value": "0" - } - ] - } - ], - "Size": 18, - "ImagePath": "下拉2.svg", - "UseCellForeColor": true - } - }, "1,20": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", @@ -192,20 +182,23 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-关联资源'!Q5" + "SerializeProperty": "='任务-关联资源'!折叠关联资源" }, - "Value": "1" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-关联资源'!折叠关联资源)" + } } ] } ], - "ToolTip": "折叠", + "ToolTip": "展开", "Size": 18, - "ImagePath": "收起2.svg", + "ImagePath": "下拉2.svg", "UseCellForeColor": true } }, - "2,1": { + "3,1": { "BindingInfo": { "TableName": "任务表", "ColumnName": "关联资源", @@ -239,7 +232,7 @@ "IsSmallButtonMode": true } }, - "4,16": { + "6,16": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "折叠", @@ -251,21 +244,11 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-关联资源'!1:1" + "SerializeProperty": "='任务-关联资源'!4:6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-关联资源'!Q5" - } - }, - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-关联资源'!2:4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-关联资源'!Q5)" + "SerializeProperty": "=NOT('任务-关联资源'!折叠关联资源)" } } ] @@ -289,12 +272,6 @@ "Formatter": 4, "HorizontalAlignment": 5 }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 3, - "HorizontalAlignment": 5 - }, { "FontFamily": 0, "FontSize": 13.333333333333332, @@ -316,13 +293,14 @@ ] }, "CellStyles": { - "0,1": 0, - "0,20": 1, - "1,20": 2, - "4,16": 3 + "1,1": 0, + "1,20": 1, + "2,1": 0, + "2,20": 1, + "6,16": 2 }, "ColStyles": { - "1": 4 + "1": 3 }, "SheetStyle": { "FontFamily": 0, @@ -330,9 +308,8 @@ } }, "Spans": [ - "2,1,2,20", - "4,16,1,5", - "0,1,1,18" + "3,1,2,20", + "6,16,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -357,10 +334,39 @@ "PaperSize": {}, "Margin": {} }, + "BackgroundPictures": [ + { + "FitToBrowserWidth": true, + "Name": "8e942f7c-d385-49d3-846b-00b7bfe666a3.png", + "DisplayName": "背景图1", + "PictureCommands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-关联资源'!折叠关联资源" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-关联资源'!折叠关联资源)" + } + } + ] + } + ], + "StyleInfo": { + "Fill": "Background 1 0" + }, + "IsAutomaticFill": false, + "Size": "767,52" + } + ], "CustomNames": [ { "Name": "折叠关联资源", - "Formula": "'任务-关联资源'!$Q$5" + "Formula": "'任务-关联资源'!$Q$7" } ] -}//A9acO6uOQ2SkXarASD99hUtFHQMCYplvi91kajnCCxj5k7pyWsqiaQhDjSUowyjtLnBAT7ZUIPFw49v7fY5Qmg+R6zkB1lHj30NgyBvspI9VcHgyHrpk05/+jRoCCjKiWnSCKFkb/osS8Nq72nOShARBy0+P65jTJK/jnVBqWlgTwb2PC2zIf70DikUlmhPwysw6IE/UNl0P8A6GZrUmTwRrh1dYLyrftgxyGhHchbWtJzBYB3/EUXCfz+RugcFXXQYh1V+VQoJizCwNmb5hbQxVUW0qiJzW5mVkcafIH+8GABt+J4yqTp1yr+JaZMvthUY5M25fCyeLH19IhTq6CRK2+WA/bTfJFCcOTrJWOhSYfCcOAXT03RA+/bHMBSC3zDfbFhtRJij6ldXMJjq//iff1wRAxqV9zn7GF0BRP2OLA+oA16HPDJ4q8bWraiD+DEkd5lE2kjii1DC8qNZ9p8dMkp7F4UhF+tp0mhtS9gzC6h5h101x4yiuCYdtnVt6wbIHcOK/1WCd/uYJjxHgmlAnnsZmo7VXS9g6NtIebxKVvDBhtWqboojl6tWnQ02BBl3Tib70F9oB2OISbxZkSs/Fhm4dWTQ5aAqdaqISJf0hZ/5W7WneaO7Lw0GmuPRAvpzuq7nvIpMFuJEZxyctF7DXhjBTlLQhTgTp5FfnYTD9IgHfAFQZ6ncVCzo6LEzvOeQVjIqKxyWI1oh+NWng3CODw+FBieXxrUry8xquFU6XxGd7x7RdfkP0vjAr7N3uZlaB/kn7nglX0CDYMKCO6mAc1oAKPkVAnZuH4GPxcwbVFA4P9RxRdP8p6ilxAkan5lec2D+pXSnub01MnUmlx6l9V1jTiufEp9L0f8sOv+FUZ4jh4CuBIVqzXAD1jczXSo7CO4E/4H4KMZwEe47o4A==|920 \ No newline at end of file +}//xHfi1rfZuOMEU1Vu7ihDQVApzGfaN3jEXxFXPYsqz0u9UegPSXePAUGSB50Mv+eT9/VB0svvuZZMJzlz49Pf1fQ9e1k6bMKnArA1IYFE6a20FNh0wQRhkZJbb6OWhmRd+Adncd0l4hNm0NYg72V+F/ghDOjmbgLrKFIYNtNDf0V67vQjr+pcZSnEBe8opYrVQIoWVEGiw0QphvixAzgpFnzmYDd9f1UQjwuWl/mTz/LUhDBWvzinkHoxy3W8Kmvkyhcx9yr3KT2VGZDiHEipyL90gNd5+wQInIiVQaiMDC8Ne1NE3gUhCq8fZU0e/rEFdh+IxyEf9cXNvIc1FdPIsUcA/AqMy/hUtx4egymcIaWwNPRimVT082D9b+BhyFKjWUmq4/5KQLw3UCLpEYIRyNr3tlTShwZYnKQoTReQDC4GMv+UbhaNKgUmyVj9wrUKUDYtfhmTIuTYOthS3V3fCrDPxfnrx4gH2Q6VEWc/YAh1YbTrr43/ZMvipK6YTJzhwVOEqgrbkcCuaYnw/zKv53O2jsGxG5HM2n2OlMZClOBJuODg925LkU0+2ranMmc7j41sxHDSB5kSKBuA6CnRdbt28/WxKmB2TY9Fx4ylcyAuPNxYOq+ctZ3DE1jbyu/GGqWJ0IAI5BZji4KYEPyjYlldo2X8uHbgpS3LPS/vBUrt95elEUEpwstgZE4CTNz3Ckzso6N/IDyCt8xJW1e6pUYSVPUt+Uv2DSvelAjeAeiEyC/B2Vo5jBt7edpS72lCm6l6jeJgOD2ErUhk8nrjRB4ZYGaWaslu82SjPlzgb8j0wu8At8AIwg9b8xUPvj7c5HutC5eteHVSJ8UJS1qgxqYfUaKJXFJ7UbYUd+oll6qI3Cs+Dqgq6KJ8NU5NsZfdUfG1YQckN5EmqpqIqozY6Q==|920 \ No newline at end of file diff --git a/Pages/任务/任务-关联资源.rd b/Pages/任务/任务-关联资源.rd index 2737e2ca..cd81261a 100644 --- a/Pages/任务/任务-关联资源.rd +++ b/Pages/任务/任务-关联资源.rd @@ -1,11 +1,14 @@ { "PageType": 0, "ColumnCount": 21, - "RowCount": 5, + "RowCount": 7, + "Formulas": { + "1,20": "IF(折叠关联资源,上箭头,下箭头)" + }, "CustomNames": [ { "Name": "折叠关联资源", - "Formula": "'任务-关联资源'!$Q$5" + "Formula": "'任务-关联资源'!$Q$7" } ] } \ No newline at end of file diff --git a/Pages/任务/任务-子任务列表.json b/Pages/任务/任务-子任务列表.json index fb4364c6..e0d60014 100644 --- a/Pages/任务/任务-子任务列表.json +++ b/Pages/任务/任务-子任务列表.json @@ -1,21 +1,14 @@ { "Rows": { "RowColumnAttachedInfos": { - "0": { + "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0, - "IsHidden": true - } - }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0, - "IsHidden": true + "DesignLengthInPixel": 10.0 } }, "3": { @@ -39,8 +32,6 @@ } }, "InLogicalVisibleIndexes": [ - 1, - 2, 3, 4, 5 @@ -117,17 +108,17 @@ "DefaultSize": 32.0 }, "Values": { - "0,1": "子任务", "1,1": "子任务", - "1,2": "增加任务", + "1,17": "增加任务", "5,17": 1 }, "Formulas": { "1,1": "\"子任务（\"&B6&\"）\"", - "5,1": "IFERROR(ODATA(\"子任务视图/$count?$filter=父任务ID eq \"&IF(ISBLANK(任务ID),\"null\",任务ID)),0)" + "5,1": "IFERROR(ODATA(\"子任务视图/$count?$filter=父任务ID eq \"&IF(ISBLANK(任务ID),\"null\",任务ID)),0)", + "1,20": "IF(折叠子任务列表,上箭头,下箭头)" }, "AttachInfos": { - "0,1": { + "1,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -157,30 +148,7 @@ "IconSize": 14.0 } }, - "0,20": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!R6" - }, - "Value": "0" - } - ] - } - ], - "ToolTip": "展开", - "Size": 18, - "ImagePath": "下拉2.svg", - "UseCellForeColor": true - } - }, - "1,2": { + "1,17": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -266,16 +234,19 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!R6" + "SerializeProperty": "='任务-子任务列表'!折叠子任务列表" }, - "Value": "1" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-子任务列表'!折叠子任务列表)" + } } ] } ], - "ToolTip": "折叠", + "ToolTip": "展开", "Size": 18, - "ImagePath": "收起2.svg", + "ImagePath": "下拉2.svg", "UseCellForeColor": true } }, @@ -455,17 +426,7 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!1:1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!R6" - } - }, - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!2:5" + "SerializeProperty": "='任务-子任务列表'!4:5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -490,13 +451,6 @@ "FontFamily": 0, "FontSize": 13.333333333333332, "Foreground": 3, - "Formatter": 4, - "HorizontalAlignment": 5 - }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 6, "Formatter": 4 }, { @@ -504,11 +458,18 @@ "FontSize": 13.333333333333332 }, { - "HorizontalAlignment": 5 + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 5, + "Formatter": 4, + "HorizontalAlignment": 6 + }, + { + "HorizontalAlignment": 6 }, { "Formatter": 7, - "HorizontalAlignment": 5 + "HorizontalAlignment": 6 }, { "Foreground": 8 @@ -519,24 +480,23 @@ "Body", "black", "Left", - "Background 1 -25", - "[AUTO]General", - "Center", "Accent 1 0", + "[AUTO]General", + "Background 1 -25", + "Center", "@", "Text 1 50" ] }, "CellStyles": { - "0,1": 0, - "0,20": 1, - "1,2": 2, - "1,3": 3, - "1,4": 3, - "1,20": 1, - "2,17": 2, - "2,18": 2, - "2,19": 2, + "1,1": 0, + "1,17": 1, + "1,18": 2, + "1,19": 2, + "1,20": 3, + "2,17": 1, + "2,18": 1, + "2,19": 1, "3,1": 4, "4,1": 4, "4,2": 4, @@ -579,13 +539,12 @@ }, "Spans": [ "3,1,1,20", - "1,2,1,3", "5,17,1,3", - "0,1,1,18", "5,2,1,3", "5,5,1,3", "5,8,1,3", - "5,11,1,3" + "5,11,1,3", + "1,17,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -623,8 +582,35 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "24,72", + "Location": "24,52", "Size": "740,272" + }, + { + "FitToBrowserWidth": true, + "Name": "a5b91882-3dd8-4016-bd97-0fdbcb5f2c2b.png", + "DisplayName": "背景图2", + "PictureCommands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!折叠子任务列表" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-子任务列表'!折叠子任务列表)" + } + } + ] + } + ], + "StyleInfo": { + "Fill": "Background 1 0" + }, + "IsAutomaticFill": false, + "Size": "764,52" } ], "CustomNames": [ @@ -633,4 +619,4 @@ "Formula": "'任务-子任务列表'!$R$6" } ] -}//ORBrl43BqdlnJPz69sg8JTl288YbPF8HckaFZqwyeB3Y+d4k64DM3fK5a0wHHgV0sy3cGI3hEGCU4ovcBFiT9R++C1LxFdaqvnJViO5worKZXKpLgzZacinu2TkAshEqRg3+gadyOlOhlYC2/EUVwQfZqO6kuubABFTK66E/1h6vmmp+h2Rk0f2Xp7m++rClrCj5EemdA7Oykhth2twi0oZ6j2L6WmAnemzCZTBK2k4RAGeTpxrxE1l5o/eXnXznq/bbBtg7yea/GSJeRlJ+Rm3BDaJePeie6Sv3BiQKAafrGeL4a0EQgxzUX+orfIy2LwFM2q6P2j5Gr3TSZuvYfOAxfoEyTZNPfThv5qtUVkJywQuvi30ZUSWNOI/gg7K1Zr2tBSWvOScglLIWaPD7byieIm1O2YTg+WUtpKkYV0aWRyLB+UcLQLmn6sAOR3fGAnmPNofOx6TUQRlb6CO8aeuBC5WGXSZsgHADpfxw5BrN3ymP3ZvvMhaVnFdLZXRc4gynPG1oJtH584BEFbtFq9E1NcpwuNiEf1SFyLVrFjSOu31dgVDxP90T2cdTi+M0dL4iW6NRozb6iDCUKT1rZ0xhug+AOvLisDGB9Z4oldgWnP8duJ4wE9nr0WgDgbleGle6SKM+bPKBEFtGTOxVxZ00jggEVe043bxHYjvP663oJlIn4MXOpjmYenMSTNFVz5xgI3R3mgxBVIFmBG1RpdJDKeyqpGDS8n5R6gYxzafKhK3QOZnpfI0dCxWUYfyTVh+ZxdKSGKw5v/XWKR+4h4C4RvsGv6WvqSmKAbu9bfuzfGB/A2RRowCuFy0PCE9Mpo0CRsTc1qZVF/9yRQ2PGGZWaB8azBVUTgRrAvDukUPMADJwS7E90CyyK6Vk+sVunzBeCYtcOQXvKdmtEyMy2w==|920 \ No newline at end of file +}//2b1gxBgbaZiq3RKHT9SnoiCjsgVsACuvF5unGO6ILKDFGltJuGYfgffRgIl4Wjk0TJlC7i3hX0GC8qPeQ4x+Y2g4S4wRNcd/7obOTH9Nz8IiekZqJUPfEQwUEt+FRF0F1SxWUF8LWXVNdjI3bcMoqmSdR1ofTEIMie48JOqQN4xhNG6JbG8Dwg+r9/nybfdsAqKc+u6dHVuqD3vB0Gd2jrqPTgW81gwquYLNL/5zltjvLkfnXzbfc/M3r9Dr00rNMZ3Z3+LS3LpzbZxnU1l505Fyqfe+otWHa/i1OneNFOITo+gB0+eo1PrUABtXTyLzFioao3CMdumJyzI0WlPTJEqI8JkT1mdEAgf8feAqElsV7ZiDQwOEgCXLBTqzt3JYk4fe+moj3ous+JgU8aYQEpY9rhunj87fdHbqBkMhSMZD8QAVHd0AYk5PHUQZRWefiiuetz/WmKP6m/qZfS0uiXGbynyb0Y4y00m04ZBYzZwIxq7TdzPY1oWnkxZeL99YCrnTWHoVnfOsCQoXhUcrQgI872rk3+OmUHpTGhf5M/KTAbohKt6dQ0xPjPZxDtvok4NEIQToB1dzMr4kqMYa0jucKEf+2sjNekNkR0x/NpeynnyX6bcNYYNCCkAS3+MvIC9gJCl3w8O4wa8Dhl8c9r7QJ0m882YmNynYb0O0XKr3wVDp73xBVY+lSMetIzVwpz2ITB8qx5DEVsiy5BOXGhbiF4GekIEl/y18Dcd4cF2sgv/SW7z7tK4GEHCILTQSD0a1z9M1S/ixRChQI6gymloFK4HqNBNEknIaJ7ghtcWn13czZKe8BziaWmQ+rR1K4f9EV7GspmiVSJ4XPeBID2s7D0bpYFsxa8A6Nms1/MuflQz9ywUiJu9jQm/yLEZRcUz2KHWmVV+fCBtaaI7RVQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务-子任务列表.rd b/Pages/任务/任务-子任务列表.rd index cdae28ca..cc697b5f 100644 --- a/Pages/任务/任务-子任务列表.rd +++ b/Pages/任务/任务-子任务列表.rd @@ -4,7 +4,8 @@ "RowCount": 6, "Formulas": { "1,1": "\"子任务（\"&B6&\"）\"", - "5,1": "IFERROR(ODATA(\"子任务视图/$count?$filter=父任务ID eq \"&IF(ISBLANK(任务ID),\"null\",任务ID)),0)" + "5,1": "IFERROR(ODATA(\"子任务视图/$count?$filter=父任务ID eq \"&IF(ISBLANK(任务ID),\"null\",任务ID)),0)", + "1,20": "IF(折叠子任务列表,上箭头,下箭头)" }, "CustomNames": [ { diff --git a/Pages/任务/任务-工时.json b/Pages/任务/任务-工时.json index c2a7cdfc..9973c95c 100644 --- a/Pages/任务/任务-工时.json +++ b/Pages/任务/任务-工时.json @@ -3,72 +3,76 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true + "DesignLengthInPixel": 32.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0, - "IsHidden": true + "DesignLengthInPixel": 10.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, + "DesignLengthInPixel": 10.0, "IsHidden": true } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0, + "DesignLengthInPixel": 32.0, "IsHidden": true } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0, + "DesignLengthInPixel": 10.0, "IsHidden": true } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0, + "DesignLengthInPixel": 15.0, "IsHidden": true } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, + "DesignLengthInPixel": 10.0, "IsHidden": true } }, "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + }, + "9": { "GridRowColumnDefinition": { "DesignLengthInPixel": 256.0, "Mode": 1, "IsHidden": true } }, - "9": { + "10": { "GridRowColumnDefinition": { "DesignLengthInPixel": 46.0, "Mode": 1, "IsHidden": true } }, - "10": { + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0, "IsHidden": true } }, - "11": { + "13": { "GridRowColumnDefinition": { "DesignLengthInPixel": 30.0, "IsHidden": true @@ -76,8 +80,6 @@ } }, "InLogicalVisibleIndexes": [ - 1, - 2, 3, 4, 5, @@ -86,10 +88,12 @@ 8, 9, 10, - 11 + 11, + 12, + 13 ], - "Count": 12, - "DefaultSize": 32.0 + "Count": 14, + "DefaultSize": 10.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -185,16 +189,18 @@ "DefaultSize": 32.0 }, "Values": { - "0,1": "工时详情", - "1,1": "工时", - "3,2": "计划工时", - "3,20": "计划工时", - "7,2": "实际工时", - "7,20": "实际工时", - "11,21": 1 + "1,1": "工时详情", + "4,2": "计划工时", + "4,20": "计划工时", + "8,2": "实际工时", + "8,20": "实际工时", + "13,21": 1 + }, + "Formulas": { + "1,23": "IF(折叠工时详情,上箭头,下箭头)" }, "AttachInfos": { - "0,1": { + "1,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -224,29 +230,6 @@ "IconSize": 14.0 } }, - "0,23": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!V12" - }, - "Value": "0" - } - ] - } - ], - "ToolTip": "展开", - "Size": 18, - "ImagePath": "下拉2.svg", - "UseCellForeColor": true - } - }, "1,23": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", @@ -257,20 +240,23 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!V12" + "SerializeProperty": "='任务-工时'!折叠工时详情" }, - "Value": "1" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-工时'!折叠工时详情)" + } } ] } ], - "ToolTip": "折叠", + "ToolTip": "展开", "Size": 18, - "ImagePath": "收起2.svg", + "ImagePath": "下拉2.svg", "UseCellForeColor": true } }, - "3,4": { + "4,4": { "BindingInfo": { "TableName": "任务表", "ColumnName": "总计划工时", @@ -303,7 +289,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "19a9acd9-c87f-4730-9670-72dd0eb75aa4" + "ID": "482b8a93-34a2-496b-b24b-b46dbbfab33b" }, { "CommandList": [ @@ -342,12 +328,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "f6c814d6-7c1c-416d-94d1-042a406d6ed3" + "ID": "62391d07-2918-4f7f-9fe0-9260424c75c0" } ] } ], - "ID": "ef4df993-d66a-4747-9c26-fc9ba04a3da1" + "ID": "a33ebec7-b73f-4ab3-afc4-9df155242877" } ] } @@ -356,7 +342,7 @@ "TemplateKey": "Gost" } }, - "3,20": { + "4,20": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -384,7 +370,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "85edcd62-fec5-4882-85e8-f4b87e0ca61e" + "ID": "57b652f5-908c-4ec8-bfe3-618af57ac890" }, { "CommandList": [ @@ -423,12 +409,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "a66339a9-1723-41a9-b289-80e45d6b4fde" + "ID": "ca37fb82-795a-4796-894e-71f49eea0c5d" } ] } ], - "ID": "fd502392-d2cc-4a3f-a08f-223d6aa5e0f6" + "ID": "e1c1aecb-be0b-40a6-8a1f-a0e9d5c63f53" } ] } @@ -448,7 +434,7 @@ "b34ba4af-48de-4a25-8bd8-ddc8ff3e714d" ] }, - "7,4": { + "8,4": { "BindingInfo": { "TableName": "任务表", "ColumnName": "总实际工时", @@ -481,7 +467,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "25b506b8-151d-4513-98c4-95b1c2920ea8" + "ID": "7c587d44-506d-4682-bc5d-b30ac1190a6b" }, { "CommandList": [ @@ -520,12 +506,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "2def8b04-a241-439e-a44b-ab99f712033a" + "ID": "aea35d5d-0351-4c6e-abf0-39005eb1c482" } ] } ], - "ID": "ea686660-e986-44fb-8f42-34a1578cfa6c" + "ID": "ae4c70ba-3a85-4970-901b-5a431ecbee30" } ] } @@ -534,7 +520,7 @@ "TemplateKey": "Gost" } }, - "7,20": { + "8,20": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -570,7 +556,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "6a4ee8e9-ffa5-4970-967e-4157c88c5fcd" + "ID": "37cb1f6a-2f33-46aa-a8cd-8b0186590dca" }, { "CommandList": [ @@ -609,12 +595,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "703e1a25-5665-481d-9359-d3a1f8505b04" + "ID": "dcc0969f-2e15-4612-bb16-c616922dbc93" } ] } ], - "ID": "edce9b55-894c-48e0-8927-1483688ab8a9" + "ID": "e96cb3db-3eb2-47fd-9404-16156d74c07f" } ] } @@ -630,7 +616,7 @@ "IconSize": 14.0 } }, - "8,2": { + "9,2": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "94f8bae36aee4ae7aec2a063ca731b1", @@ -766,7 +752,7 @@ "TemplateKey": "竖排无样式" } }, - "9,2": { + "10,2": { "CellType": { "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", "ListviewName": "图文列表表格1", @@ -805,7 +791,7 @@ "hideOnSinglePage": true } }, - "11,21": { + "13,21": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "折叠", @@ -835,27 +821,17 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!1:1" + "SerializeProperty": "='任务-工时'!4:13" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!V12" - } - }, - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!2:11" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-工时'!V12)" + "SerializeProperty": "=NOT('任务-工时'!折叠工时详情)" } } ] } ], - "ID": "406a9887-4f54-4cc2-96fd-8540a94b27bc" + "ID": "9a13993a-dbdb-40f6-8e4d-abb712a58e5c" }, { "CommandList": [ @@ -865,27 +841,17 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!1:1" + "SerializeProperty": "='任务-工时'!8:13" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!V12" - } - }, - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!6:11,'任务-工时'!2:2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-工时'!V12)" + "SerializeProperty": "=NOT('任务-工时'!折叠工时详情)" } } ] } ], - "ID": "5a2b0ad1-0397-4370-8c0b-1f08b5242be0" + "ID": "952e4ae9-4dec-4740-977b-8cf23d8097d1" } ] } @@ -959,61 +925,60 @@ ] }, "CellStyles": { - "0,1": 0, - "0,23": 1, + "1,1": 0, "1,23": 1, - "3,2": 2, - "3,4": 3, - "3,20": 4, + "2,1": 0, + "2,2": 0, + "2,3": 0, + "2,4": 0, + "2,5": 0, + "2,6": 0, + "2,7": 0, + "2,8": 0, + "2,9": 0, + "2,10": 0, + "2,11": 0, + "2,12": 0, + "2,13": 0, + "2,14": 0, + "2,15": 0, + "2,16": 0, + "2,17": 0, + "2,18": 0, + "2,19": 0, + "2,20": 0, + "2,21": 0, + "2,23": 1, "4,2": 2, - "4,3": 2, "4,4": 3, - "4,5": 3, - "4,6": 3, - "4,7": 3, - "4,8": 3, - "4,9": 3, - "4,10": 3, - "4,11": 3, - "4,12": 3, - "4,13": 3, - "4,14": 3, - "4,15": 3, - "4,16": 3, - "4,17": 3, - "4,18": 3, - "7,2": 2, - "7,4": 5, - "7,19": 6, - "7,20": 7, - "7,21": 6, - "7,22": 6, - "7,23": 6, + "4,20": 4, + "5,2": 2, + "5,3": 2, + "5,4": 3, + "5,5": 3, + "5,6": 3, + "5,7": 3, + "5,8": 3, + "5,9": 3, + "5,10": 3, + "5,11": 3, + "5,12": 3, + "5,13": 3, + "5,14": 3, + "5,15": 3, + "5,16": 3, + "5,17": 3, + "5,18": 3, "8,2": 2, + "8,4": 5, + "8,19": 6, + "8,20": 7, + "8,21": 6, + "8,22": 6, "8,23": 6, "9,2": 2, "9,23": 6, "10,2": 2, - "10,3": 2, - "10,4": 5, - "10,5": 5, - "10,6": 5, - "10,7": 5, - "10,8": 5, - "10,9": 5, - "10,10": 5, - "10,11": 5, - "10,12": 5, - "10,13": 5, - "10,14": 5, - "10,15": 5, - "10,16": 5, - "10,17": 5, - "10,18": 5, - "10,19": 6, - "10,20": 7, - "10,21": 7, - "10,22": 7, "10,23": 6, "11,2": 2, "11,3": 2, @@ -1034,7 +999,51 @@ "11,18": 5, "11,19": 6, "11,20": 7, - "11,21": 7 + "11,21": 7, + "11,22": 7, + "11,23": 6, + "12,2": 2, + "12,3": 2, + "12,4": 5, + "12,5": 5, + "12,6": 5, + "12,7": 5, + "12,8": 5, + "12,9": 5, + "12,10": 5, + "12,11": 5, + "12,12": 5, + "12,13": 5, + "12,14": 5, + "12,15": 5, + "12,16": 5, + "12,17": 5, + "12,18": 5, + "12,19": 6, + "12,20": 7, + "12,21": 7, + "12,22": 7, + "12,23": 6, + "13,2": 2, + "13,3": 2, + "13,4": 5, + "13,5": 5, + "13,6": 5, + "13,7": 5, + "13,8": 5, + "13,9": 5, + "13,10": 5, + "13,11": 5, + "13,12": 5, + "13,13": 5, + "13,14": 5, + "13,15": 5, + "13,16": 5, + "13,17": 5, + "13,18": 5, + "13,19": 6, + "13,20": 7, + "13,21": 7 }, "ColStyles": { "1": 8, @@ -1047,16 +1056,16 @@ } }, "Spans": [ - "3,2,1,2", - "7,2,1,2", - "3,20,1,3", - "7,20,1,3", - "7,4,1,15", - "3,4,1,15", - "8,2,1,21", + "4,2,1,2", + "8,2,1,2", + "4,20,1,3", + "8,20,1,3", + "8,4,1,15", + "4,4,1,15", "9,2,1,21", - "11,21,1,3", - "0,1,1,21" + "10,2,1,21", + "13,21,1,3", + "1,1,1,6" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1114,7 +1123,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "24,131", + "Location": "24,119", "Size": "741,354" }, { @@ -1128,14 +1137,41 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "24,64", + "Location": "24,52", "Size": "741,52" + }, + { + "FitToBrowserWidth": true, + "Name": "d53a723b-acdd-4b76-9505-d1b500669e78.png", + "DisplayName": "背景图3", + "PictureCommands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-工时'!折叠工时详情" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-工时'!折叠工时详情)" + } + } + ] + } + ], + "StyleInfo": { + "Fill": "Background 1 0" + }, + "IsAutomaticFill": false, + "Size": "765,52" } ], "CustomNames": [ { "Name": "折叠工时详情", - "Formula": "'任务-工时'!$V$12" + "Formula": "'任务-工时'!$V$14" } ] -}//tVTNkGnB9RMpx+hgKCEvJssiyqNdaJq2k+QyftaMvQI3FolVZbk85LFHwRfXzxyc0D5mtKc8M6I0orO78YaqQHAxas2QwH+3kDnzUWmYVrRab9J40dd4aMSpZiomlzVsnazELtryebpAZNrAtoJC91FWsbguO86or6OxdzbvvToU6VPxofRvwjkAw+IzR6DliUIgqOZoiVu2998k8t6jX6us8544dyo+90K7pXfmzGybicvkNutCLOG8ZQlmj4E0QQ2F/aMFs84RVSu9rNzHwCe/tjrTN8Od96oateRmGggMuV5fh2qNkXirfXHLVzgvO7pORqd+63MhsWTHZmRl+L72Xxh0j6VhToPjkcFzXwX8T69H2KA7cfK/0fkJfRmOweUfJABdkj3+1YduuvZZ/sI3uPhBcoi7hKMzXdEnkktWRxqU8iV0ZhXvsgqDeMeTAgCQ3FVsstgViTBChsFP9OLl7RJWXKeMfQ7oQ+e669LDW7ddt20qi09ji24gx621sGNNunDlRPWC0Jn1xff6XYlKjyrud4H40+zdCURgoZh0X8ujxA4cj24xxm4IhUz1PUzMbzknzZdv8x7xV2wp2fBHogmqu3eadvHVLJgGKOcH3QYq0apCQV3u9u6goU/YJeM5m8S0I8NP8A3yXpsuWpdLrOk1ylXWYCI8QbBmFdFcie8//LGkfd00gRQg1300lOjgocvwaJ6KJpfKPCx8/KAStAte4kTOjqvlYRbL+K39jT4FOZvLpihdyhvzbwExeCmKRlG7NfK29J6nFvJxcVXGfNfZNarCDtbbwAExFH0J3+ntLLVSwSEhC0u4qf4RlPiXMRHI6T887R1fbTtCQViViV7Lyd8fpFXqS9tMBdCYjotUNhujPTRxgLIfYCJHTi2sIME4EhSsWoohaG6Ddw==|920 \ No newline at end of file +}//d8wYGYDcVSD8bsNbpdx95yGIx9S8wS+wGpa408bsMUcZLQoGAlCXpXCrbnU+CemYRmAI7M5JlPdNCufyQBT/SaKIPKn6vikdLBeIQ9o5tbqfQxGV33rXFk5uQYAOjECYnujBLBkdEAO5UAzPGM6fV2usRcar+O0Anp0gFO3gbxxc9vDd/AkO3hEZoCHKBlzarfTugpDZ1+xjxC1ogQSr4dwfRLQ05nOp8ZLTXGxC36+JnAb+rLzQhws6UzAGNJ/X3THrdZTRnrGyNX5RSXPKa7HvsGqdLW3KaCnOOOIhT8iM6D2OTE5fAFfrhXI5BpaxcCUx+SfkqSPKXeCe53C8mOubIpxmUhzsMLozAcr2bM6LhCE2jp0paoBCgquruweHoNZMiA+VFeqo72KL7lHOQtfaAnQ5zHizQJ08misUlvXMWyzPkRqtM2ypvbvSSvlldLguIVXD3W+h2r0BObnyZKJ0ouaqHe51JVxumEYcIQsoMQnPKgW4AGrhqInXJ61b33R3DGg0pPjEtOnOWrArwB/lDinCVsf/NG5OfrddrwHOGtoUSsU5G5WlikxbVMHbsCx9NZbvVR+zTiFyhYf4f262CeLtjrmMl94GFzUizAfHyQNOgonorRYr79CuPE7lkRTnYKUsdti6Gnz0Zpgajb9XXHfNd65kpgLk6wJKo3/xHs4IjMsqv5ioVsuR0rkLHYHXODfBfa0C38XSc9QXqLsWzRxGQu8ptE9ks0Z14AcQfE7CfTvV/538oRwmDG8DGXQh54mJSyv/bbQi9jJraAIiYBZio6BU3qLmcPKCY4JkMBF8m1DPYTperA+EkbuvIKx/3e2zEaBv2oVHWqd/3CceQ2i+SV4Bao+8YA9P3HytDG5BLRImjM63L2wbcLfugg35ciM1bCnU/lTZId6FhQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务-工时.rd b/Pages/任务/任务-工时.rd index 62e3029a..32413f1b 100644 --- a/Pages/任务/任务-工时.rd +++ b/Pages/任务/任务-工时.rd @@ -1,11 +1,14 @@ { "PageType": 0, "ColumnCount": 24, - "RowCount": 12, + "RowCount": 14, + "Formulas": { + "1,23": "IF(折叠工时详情,上箭头,下箭头)" + }, "CustomNames": [ { "Name": "折叠工时详情", - "Formula": "'任务-工时'!$V$12" + "Formula": "'任务-工时'!$V$14" } ] } \ No newline at end of file diff --git a/Pages/任务/任务-进展.json b/Pages/任务/任务-进展.json index 188dce5a..9e2ebe18 100644 --- a/Pages/任务/任务-进展.json +++ b/Pages/任务/任务-进展.json @@ -3,41 +3,45 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true + "DesignLengthInPixel": 32.0 } }, "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0, "IsHidden": true } }, - "3": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0, "IsHidden": true } }, - "4": { + "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 272.0, "Mode": 1, "IsHidden": true } }, - "5": { + "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0, "IsHidden": true } }, - "6": { + "8": { "GridRowColumnDefinition": { "DesignLengthInPixel": 27.0, "IsHidden": true @@ -45,15 +49,15 @@ } }, "InLogicalVisibleIndexes": [ - 1, - 2, 3, 4, 5, - 6 + 6, + 7, + 8 ], - "Count": 7, - "DefaultSize": 32.0 + "Count": 9, + "DefaultSize": 10.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -144,13 +148,15 @@ "DefaultSize": 32.0 }, "Values": { - "0,1": "任务进展", "1,1": "任务进展", - "3,2": "新增进展", - "6,18": 1 + "4,2": "新增进展", + "8,18": 1 + }, + "Formulas": { + "1,21": "IF(折叠任务进展,上箭头,下箭头)" }, "AttachInfos": { - "0,1": { + "1,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -180,29 +186,6 @@ "IconSize": 14.0 } }, - "0,21": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!S7" - }, - "Value": "0" - } - ] - } - ], - "ToolTip": "展开", - "Size": 18, - "ImagePath": "下拉2.svg", - "UseCellForeColor": true - } - }, "1,21": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", @@ -213,20 +196,23 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!S7" + "SerializeProperty": "='任务-进展'!折叠任务进展" }, - "Value": "1" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-进展'!折叠任务进展)" + } } ] } ], - "ToolTip": "折叠", + "ToolTip": "展开", "Size": 18, - "ImagePath": "收起2.svg", + "ImagePath": "下拉2.svg", "UseCellForeColor": true } }, - "3,2": { + "4,2": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -269,7 +255,7 @@ "3de34b47-f0f7-44a6-bad7-b893dacefb51" ] }, - "4,2": { + "5,2": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "77fae08dfbac4664a299aa7ec207218", @@ -342,7 +328,7 @@ "TemplateKey": "竖排无样式" } }, - "6,18": { + "8,18": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "折叠", @@ -354,21 +340,11 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!1:1" + "SerializeProperty": "='任务-进展'!4:8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!S7" - } - }, - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!2:6" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-进展'!S7)" + "SerializeProperty": "=NOT('任务-进展'!折叠任务进展)" } } ] @@ -396,12 +372,7 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 6 - }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 7, + "Foreground": 6, "Formatter": 2 }, { @@ -414,10 +385,14 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 7 + "Foreground": 6 }, { - "Foreground": 6 + "FontSize": -1.0, + "Foreground": null + }, + { + "Foreground": 7 } ], "Types": { @@ -428,57 +403,77 @@ "Left", "Background 1 -25", "Center", - "Text 1 50", - "Accent 1 0" + "Accent 1 0", + "Text 1 50" ] }, "CellStyles": { - "0,1": 0, - "0,21": 1, - "1,1": 2, + "1,1": 0, "1,21": 1, - "3,2": 3, - "3,3": 4, - "3,4": 4, - "4,2": 5, - "5,2": 5, - "5,3": 5, - "5,4": 5, - "5,5": 5, - "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, - "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": 6, + "4,2": 2, + "4,3": 3, + "4,4": 3, + "5,2": 4, + "6,2": 4, + "6,3": 4, + "6,4": 4, + "6,5": 4, + "6,6": 4, + "6,7": 4, + "6,8": 4, + "6,9": 4, + "6,10": 4, + "6,11": 4, + "6,12": 4, + "6,13": 4, + "6,14": 4, + "6,15": 4, + "6,16": 4, + "6,17": 4, + "6,18": 4, "6,19": 4, - "6,20": 4 + "6,20": 4, + "7,2": 4, + "7,3": 4, + "7,4": 4, + "7,5": 4, + "7,6": 4, + "7,7": 4, + "7,8": 4, + "7,9": 4, + "7,10": 4, + "7,11": 4, + "7,12": 4, + "7,13": 4, + "7,14": 4, + "7,15": 4, + "7,16": 4, + "7,17": 4, + "7,18": 4, + "7,19": 4, + "7,20": 4, + "8,2": 4, + "8,3": 4, + "8,4": 4, + "8,5": 4, + "8,6": 4, + "8,7": 4, + "8,8": 4, + "8,9": 4, + "8,10": 4, + "8,11": 4, + "8,12": 4, + "8,13": 4, + "8,14": 4, + "8,15": 4, + "8,16": 4, + "8,17": 4, + "8,18": 5, + "8,19": 3, + "8,20": 3 + }, + "RowStyles": { + "2": 6 }, "ColStyles": { "2": 7 @@ -489,9 +484,9 @@ } }, "Spans": [ - "4,2,1,19", - "6,18,1,3", - "0,1,1,19" + "5,2,1,19", + "8,18,1,3", + "1,1,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -548,14 +543,41 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "24,64", + "Location": "24,52", "Size": "720,316" + }, + { + "FitToBrowserWidth": true, + "Name": "138b82b2-1efd-46c0-8ac1-7b984f417427.png", + "DisplayName": "背景图2", + "PictureCommands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-进展'!折叠任务进展" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT('任务-进展'!折叠任务进展)" + } + } + ] + } + ], + "StyleInfo": { + "Fill": "Background 1 0" + }, + "IsAutomaticFill": false, + "Size": "744,52" } ], "CustomNames": [ { "Name": "折叠任务进展", - "Formula": "'任务-进展'!$S$7" + "Formula": "'任务-进展'!$S$9" } ] -}//M3TvDoTziNVXYCwqmSTz0ogGfVUcksJ1jsM6l1wgmgfZwoIzDewvLEtu0KuprcOv1g0UAPFWe7RzXIHAEvcRqetvjaZerGgptbl0HuUJCc4Oil+5wK7WGKMqvDJbG421QB+yXEvkWbP+/NyqMNoyKBV8ZTTnPV+3Ow2KEMnTMG1wDklwzRlhYNK8UpLPnNdXYuVqxIioPTIQzPoPtnCoBMwotKMm72h620I9Q4keZ+AhlA6jMPdYVRDjixU1/OQfk2eviUaAr8HLJxCav3noN4OevycG3G8/OY8pOv9iQfIGzc/9AdduuQ8ogee9LWH6vKn6UVgZ7IaUx+NipC7NQiXuu/TJ6y3EiL7rKpYUs0gL4e+uDnbdJX9zBav9JhQ09WNlIZVPfj/0zNnAa/6b0rGbpIhzbPN5BGczUQxclNMQsj8dl0ZBjCkHbUcpTtjnaRbf0m7Y0WJ+ZlWOov0Vwva0RKam4Oay7JzSNB17MfRbJwaBqzOLtBbog2j76EIyttnw/mzvrTfcy7m0Wy8bb/HaEykYwCnQ914zfPzL70UfdjinUxeKefxIkrF+b152VU2JbvkN7BfI1Ll2VrOtRLiI7Nw4WB9lsi/o9xAwDCMSx6sQYCiWAV8JWUxVn+5W1x/rrdgpk0I3TfY4A2FjxS8oD8jzAoxY4Y+B00tt1URsheaVmYUg5+3QBhv/9gE1kCuUBtoMRvW7ZL6FLUVB22bfFtBLGx6KbeRH8OwaZnfautimIpHc+A6RTObC1ELVNRWNmt3mSlvuqN61newgY2+Pp70j22tK77OGuSHlAsdtiegy/3FBNEc1X5YDuJ134HpJ52p9A2KHvtgw1DWsNrs7GXXjGiNe5qfYu9BxqKQcLtCabfDjnSMzRt9gGhisKtdrd4EeDA6rskwcdFwTxQ==|920 \ No newline at end of file +}//aNP4mXyfYYSdiHcqdV92nMjxqySVT4n8j78M0YMFi5wSTKdPRv+JWtf03oXWPOjPeEZHn7AelJs4dPJvxxMvLLfxhy+O3tySr9yZ6fZ/jaDchjPFbQOp1Ge87WAQvJDTY3X30aELgBmW2aHz4JvtHc+OTip1Y2x+hyzAAyF8DNi4eb4145/Cd6PJCjIUMEDiKM/wh/lyd7JLYxIvKF70bj+ZgJ/uo+SZHKgmlWRf15bR05RE910PXBqnMbtMrPwoyWgfbSxkfDIVQaLrybnMCKDB4qad0Ei5/dbxr40E5tHelBuuN79VBA3GaLsZrLadHxHlfKWDYEtxchMGKpFKLRWZ+UVW0Lo88YYMoH0ipmlwzF/QA+3QjjrpLMW5qEEuUXXwXHaTdlsa9qqtiHqLiykl2dK6G4Q57Hj0F4LIG+oQB+1XYPsml8PcHJJD6++xNgueYn7/DNdMbpNgXPzuoWK1xJjECaK7YAVBRhxYcQxaJwVkiSLxLuSGmzFa+FsmozV1QdD6dDy+yE0c4Bk/J+ZFBT/1ds0IHjph5w3q9SQ2c1h9z4jBHKorQL9yQWQR9NU2ybHJr8nxJVy4YjjRhI+P1iqTlAhVc1SpBNLyYc+tXF0osDYoAykksVPC+FUX/nJ7PPe3QWFWEy8YXAaAFtnBMuClloZuPZCfbzURXUHJtuNx0tXugSWihpCPfBrSvIYww4cFZRJUKX86w1v27O77zd9sy2E4RnShGJdknM/gHrNHuIxT9IkW+nkkenxIvYixFiMb9zF7gzo3c8H9+xV1rOUqnjpAh+RrSxeF2gBE9CYHOpll+KckfjfiiEqf/tcxh76txJsDLByO94FU71pWRFSu6kUbRYF7uKaMD/pa8VfUYi+6RCLWIOfNFFqfc6HbOFXG38gqdkI7Nn72BA==|920 \ No newline at end of file diff --git a/Pages/任务/任务-进展.rd b/Pages/任务/任务-进展.rd index fe343902..fe89d19e 100644 --- a/Pages/任务/任务-进展.rd +++ b/Pages/任务/任务-进展.rd @@ -1,11 +1,14 @@ { "PageType": 0, "ColumnCount": 22, - "RowCount": 7, + "RowCount": 9, + "Formulas": { + "1,21": "IF(折叠任务进展,上箭头,下箭头)" + }, "CustomNames": [ { "Name": "折叠任务进展", - "Formula": "'任务-进展'!$S$7" + "Formula": "'任务-进展'!$S$9" } ] } \ No newline at end of file diff --git a/Pages/任务/任务部分.json b/Pages/任务/任务部分.json index 6535dec8..676cfcb9 100644 --- a/Pages/任务/任务部分.json +++ b/Pages/任务/任务部分.json @@ -9,12 +9,12 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 5.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 5.0 } }, "3": { @@ -25,28 +25,28 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 5.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 5.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 39.0, + "DesignLengthInPixel": 52.0, "Mode": 1 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 5.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 5.0 } }, "9": { @@ -57,12 +57,12 @@ }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 5.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 5.0 } }, "12": { @@ -73,12 +73,12 @@ }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 5.0 } }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 5.0 } }, "15": { @@ -89,7 +89,7 @@ } }, "Count": 16, - "DefaultSize": 15.0 + "DefaultSize": 5.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -649,4 +649,4 @@ "Formula": "任务部分!$A$1" } ] -}//lSDudjxOWddtNutDB8SJeGQCFwKG46gQkffVtUehLwWFAuKyt7NbK2nOOrVZWDwFBH5qobphA7vcD3nRA8nNqYdGV5TaZRQf2BYbqMJ5nigCpbFetm6JXd/Hn9Ztf3awJWuAvgz/rlW7Paiq/baQDokT8vUSuaC6mP7oyvENJSBCL3ohadpw3H7meLhVxPCSyM/PnJKE+1pp18uDy2GlXl7NKUbbyWYfTowMq2nQs7Gi6TgZmXYOOsccMoiIYRE9kIWYVKNUAqesho///yY1jFWWw+9U4gJyGCEQ97f5CiRPu8ztBAa8gSfjYOsQXl42Kg/1AutmoCCQlJUYa7Mwx53uybKTkLC9XHRxW+DbyWsUCWOQz3XK+hqbWB6o3LZxLYjRqyngP4by5VQmGxBzFzZWI977uAT+z4zD9sQp/C3zCqofDC7PijxLEts7O2RVIR4Cc+tOS/TKU9c4T9gpOI6lWP/lV6DFD/SSEMU2+dc4qBVJTmck2tvXnrqkr/yhrvBAPOuE+2n6CFGZZBpYiIi6TVBer/KvH7IwsMp3ISYXYWA3KBWNvFTDKNXA5oqThqF9lW9Zx/jPAM2vGb8RWjVSt/QcfcvWepw11WkcQDYRxIGbBa2vhBgZCE1WKUFZlMdVqxkYOsyh6d7YDTgz9LdJZgkfOpxhjva+7crkgntMTsSKULGNznwccomkGWhrd5jzNFUCCVT9JTYMCi+kcbplnX+rAja948bZ2sw6idWG8pA+soqTu5dHPyLfLmuP5M4kgEyXjclt5ttV0lHRtIOxQFtCt+BTmW5NessMi/74t5tn6ffpHvNeOMV6DchFnJ19n1EqblOx0KR4maujnEKb16NV9XxMQQurvfJULOtAElLrJHInDkCPY7aMyBts3IsWvxpLf/gC/vrEVmQdPA==|920 \ No newline at end of file +}//zOSKgzGJEBDHfclw4dDrRuN3ksB9TOgTJA4Z4/tdNE30bhk1v9fqIZIshPNE/H/4Uv7nPL3gY5vTI8OCgp2anVskGQPIzrjgL1npq+E+wyfcRP/IDIjCkKAIOo+IwG9nEkgOUvoGa6k3tCVxKfKF1QNxIGJW2piMkE2MCFS47FdK3OSn34c0Fn1FK8fvjOVFN0HqOsEJALxkGdKtT54AqunPcTBxfALaR501XcSzSw7Ah8PCug24lsjQAciaLSMZYosBnLzRw3UArjqjMAOD4Zbb+p3zRpTugV0fXILARl1sXBVctQmB9I+EdB+Bo5bJdnJvO+Fo7iiyLoKsvdMDcXtQA5rRAgFBF4PJZOqj2ZZO+4vJSZErIK28xjnee3pK7dMG3h/2plBj/KtM9Hov0CtMJTn1qF2r9fAuF4ZNsex3FjEVCSHswA8bJ1GnlZuryFpZ2lcc/PSS0baZHvq+N9xAhWbvmkDIjyDR4jgWdN9tb7f4ohEB7W/Bph3la4IVmKeHefnuqxC/KtSPqS5jPFPWcsoP7nn/kvdRkHFZzj0OpPBn+51YC5jKzWUmjfqQroPE6qMEJIKyoT7ttuIQnJr6MPaygRmCdJRnzFHUmU8hso72dcr9W9pPRHNQvrFwCBY8xJhLgNiUJIRRVeTUconpk8jMqdrWLATwVMci2wB6WWn4Shpce8hUMXDrc89SAd8vdyQGl+S3zZIVmtGTGzrWcLHtlrN69CoyCt5SDzIadynWYwOOx4HhpFDmuIqi0bq01QGt56bHk7+nI44vpldR1TSeFn3ZHAVpdWOi9dES1pw42f4nYB9JI7LnlrAkdxk8Y6P59/MFe+DmUDBU1lz5URPPj5YA6SvU8JVOxv8SwNtjzK88VMnK/z3Tc9SiZAtPOo1gUIddfLfiESjc5g==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index 261875fd..27d1163d 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -361,6 +361,24 @@ "ColumnName": "总计划工时", "GUID": "66115867-4c74-4e00-9197-9b03a2a24e92" } + }, + "6,19": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "ToolTip": "展开", + "Size": 18, + "ImagePath": "下拉2.svg", + "UseCellForeColor": true + } + }, + "6,20": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "ToolTip": "折叠", + "Size": 18, + "ImagePath": "收起2.svg", + "UseCellForeColor": true + } } }, "StyleDatas": { @@ -437,6 +455,13 @@ "Background": 4, "FontFamily": 0 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 7, + "Formatter": 6, + "HorizontalAlignment": 8 + }, { "Background": null } @@ -449,7 +474,9 @@ "Right", "#FFFFFF00", "black", - "[AUTO]General" + "[AUTO]General", + "Background 1 -25", + "Center" ], "Borders": [ { @@ -518,10 +545,12 @@ "6,15": 12, "6,16": 14, "6,17": 14, + "6,19": 15, + "6,20": 15, "6,23": 12 }, "RowStyles": { - "3": 15 + "3": 16 }, "SheetStyle": { "FontFamily": 0 @@ -583,14 +612,30 @@ "Name": "参与人数", "Formula": "任务首页!$Q$6" }, + { + "Name": "工时分配方式", + "Formula": "任务首页!$E$7" + }, + { + "Name": "任务总计划工时", + "Formula": "任务首页!$K$7" + }, { "Name": "任务ID", "Formula": "任务首页!$E$6" }, + { + "Name": "上箭头", + "Formula": "任务首页!$U$7" + }, { "Name": "收起侧栏", "Formula": "任务首页!$T$6" }, + { + "Name": "下箭头", + "Formula": "任务首页!$T$7" + }, { "Name": "项目ID", "Formula": "任务首页!$K$6" @@ -598,14 +643,6 @@ { "Name": "折叠全部", "Formula": "任务首页!$V$6" - }, - { - "Name": "工时分配方式", - "Formula": "任务首页!$E$7" - }, - { - "Name": "任务总计划工时", - "Formula": "任务首页!$K$7" } ] -}//c4Kxz1nhk6ja5Qxk0OMBpx6HdzMED1fEnK3Bdyya7oLzjCMdinnPXy7Fqir+xdZUIrFJhKsAQL2HmwKDoPJ5UP5mwGsIueuyPX7dqt/w7m1/q6VqPJ92TaS3W6JZ9Ufv7dUBBJ6xuJ5ylKCbhkQ0fvczEBuRzkeReOAe/+wPn4Cr/t9eP/rZDSqEWrmjuyI6tSq/uFpO2h9b1mhnRUkI/OD/+zZJf0pd9cjSJzIPyje88Ohv7zjuxkCbnqOHkKtEDLgNxtTi3p6bX7s0XL36cq2GYG0ygDUJ6cwBN6DMyYdmp2LjiR5m1eFDcDdvtiOFMIGrAZofDMZdBJmFYslvcn8bWpJPIz8qsmfnf1xVbjLexbXtkcEQZNVtm8PGjMDKPGztl0CQTISD+OeBEB5Kslzp669s+WqihPGWWCd69wclfaHVlJ+sFS89MtquyNSrq5VAUOZ4lFGiPMNp4EqosNgsVWXiqcV9tMGCRvr8JsxJ9vXJnird9uJDbHlBQqmwCAWmWxdm/7TmeiyrSqKPpsnBd9tlaq/n9zolLBoeVLFsMa3+75eT4qUmJLIIl/TPNsxJAGrrF6gNH/rnPlOT1KsBZnJOCNLRoYW0SEVRwUmhFNvppolicQ3mvGzLIb7HXSlE+V1ZvN9hr5AKsrr+CQmzQPI+IdTU7a6L2UwheTVzkr0/7GyLYK99c42UJhDyrQ0q2/3up3rK6BYgkNCyqNU9uc+mShC70eZRiL1+dk7cFLsYvwWYaTKx3gO2LPpWLz2c4S8+OkKfBgMJ0M/HFhtJBW2JF65FOdHKYi8ZLh6u4AF8lvCCqORvJqDTiUfw9gqvMBmo8lYEkwZqCy/vm2LxDgN8gZf9gFUdksumg+cTs8riCOZasiTorFks0+pQCcEnfUYcr95kiKMIz1anTQ==|920 \ No newline at end of file +}//5azb9nnKxku3anhiLtY7U9usTgWlW8NxcfLpDF2BlDw+YPSSoCJug85RpEusE2/d1828z1dYbeTEsq4fOStIZg24eJWpX8DoDEXzKu3zC1RqwEp3KL8eqrg/hXbefpCX3j8kFmIXOBlxDMD7s+WJaLcQi+s7r/IF6xoU25uLxlRgLEt2/lCuQ0x1ZsbIAT64MmmqV8j9XgjrVXk4VMCfMlLUJ9OjUdy8y2Q2h9e+ilYWU64o1y8pU8TvWpCTVIqwm6aZaauuCnEXAUZm88zyPThxlA6zOl47vpatG1WkJi6ELKViNydB8axr0pd7M9cRrqfRWiwAgGpBD93wytMyOeuEPbYfg3MN+eS3299SBAJSIdc6LpjsMvQeag6SNGl/YC5aABaiDIGnIyPFzueMCBTJMsyVi1jFofsm2pG7cxkoQaUO9+ZhE3O6/kgzMSMS41mTIOqPwwxxVJXYlTCtU9s2fSDjXUaQ9+U7XOGUmfhoSlbho/uaEWDLuie+BWaZrXdCueEDcHsZe/xK7n6yMVKQkUtCZEDzn+JAs5ueTfMSN3nG/iPI9aXpOokehOjL+TeVwTTnHpuWIDdhyKpIdqYT+CViNk6wWO7PwYmsesqKLmo+GQoorS5P15fA1seHIunBLG79Sis+/prPRozC5L93A5x1vfoahQRzpiW9vk09dLEOGlEGkssQbT301GX+2b/GZlMvQS1AwRmcs3eazMw2ycIpwI+fxOsjuS6lkbP8vtdYFT6+uzh0vs1JcKwOqQnAximF+rqGcoeQgxWDe+lMT6kKX0fp+kfP0JilHkFwjPdKXzjhfZKl40/7yIIWU7obSgZh0S2EN9WMCIhGbRnLjK+4xnGybi0q3njBVeVL/+FGWDyRgEIrds23o6I/xPlMjUBp1ium1fkP0fk2+g==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.rd b/Pages/任务/任务首页.rd index 799890fe..e27b0659 100644 --- a/Pages/任务/任务首页.rd +++ b/Pages/任务/任务首页.rd @@ -7,14 +7,30 @@ "Name": "参与人数", "Formula": "任务首页!$Q$6" }, + { + "Name": "工时分配方式", + "Formula": "任务首页!$E$7" + }, + { + "Name": "任务总计划工时", + "Formula": "任务首页!$K$7" + }, { "Name": "任务ID", "Formula": "任务首页!$E$6" }, + { + "Name": "上箭头", + "Formula": "任务首页!$U$7" + }, { "Name": "收起侧栏", "Formula": "任务首页!$T$6" }, + { + "Name": "下箭头", + "Formula": "任务首页!$T$7" + }, { "Name": "项目ID", "Formula": "任务首页!$K$6" @@ -22,14 +38,6 @@ { "Name": "折叠全部", "Formula": "任务首页!$V$6" - }, - { - "Name": "工时分配方式", - "Formula": "任务首页!$E$7" - }, - { - "Name": "任务总计划工时", - "Formula": "任务首页!$K$7" } ] } \ No newline at end of file diff --git a/Pages/共用/编辑删除页面.json b/Pages/共用/编辑删除页面.json index 5dd7312f..22653497 100644 --- a/Pages/共用/编辑删除页面.json +++ b/Pages/共用/编辑删除页面.json @@ -8,12 +8,12 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 30.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 30.0 } }, "3": { @@ -29,22 +29,23 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 15.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 89.0 + "DesignLengthInPixel": 61.0, + "Mode": 1 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 15.0 } } }, "Count": 3, - "DefaultSize": 10.0 + "DefaultSize": 15.0 }, "Values": { "1,1": "编辑", @@ -111,7 +112,6 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "TextIndent": 15, "HorizontalAlignment": 1 }, { @@ -125,7 +125,6 @@ "FontFamily": 0, "FontSize": 13.333333333333332, "Foreground": 2, - "TextIndent": 15, "HorizontalAlignment": 1 } ], @@ -169,4 +168,4 @@ "PaperSize": {}, "Margin": {} } -}//cfYN6HEKLdYb7ino7SMh0cifsvk0K8mTZoc0N8pUugZ3uwIs8JBhaHhmx1qfDEOZVoRim3pmfmQSo/y8ATYYwlZCj9b6vYWJXMJo0TqhnaMoevR1H9NwTAHk7HcCi9kd+FbUnATAiFs6HgvUVip/oCRXHNFhtnWEOtnGXuZSjbji+BO3OpObk/WaHHrzNifTmNmz6Ez1pEryEfHaNOvtAJ9DcxGM5I0R0wfau6Za0heW6uZiTqAR69/BctdfQm5DTVsrBXCrpXWwTvsdkETkzEc2d0E63urYd6ksXdCes81gFA7TM7ktPCrIlVxzPC9FDks5HsRyHSyh8naBF7XHgc+fTDwzXcYYtR3S5FH/7jCD9+q80DCx6N1Mrzs9xRn4M7BFiWz5ixUC8JYwMdl9aBlbBng+geskoD4WllbX01YBJqNByAyDw58k2JmYUpgasrhUK/qwOwL4fcPbEOI9spw0nKkrUzwX+PIVj1ffkQkU71ucSCT66TiUb8Ck0voY/Cl+sk86TSW8MckFfUbpQWVIwWUY+HNcasV1n8+CqJvIs/HJL72NTdHdGbBMnaIXFTo4zUNfQxt0PEwRQHLq9WosbL+ooQ4/Zx8akgNlKjoMFcVY2puKw3Ty6Ipb13dId1cFHv71q4r0DBaBcD3mySLOXktf9pQGAFuW3fC0HmGblzCsAKH8sqCUXr/BLVkZChwGDQufZaAx5aEP7Ps4IYXke5DzFhIUPN3pqeRSeIgC0yCt4rhDDNil8blhPNg1LrB+xhgDXLbtqW9Mmpvg1zKWeUc6i2IszeIoRn5AIM+qJQne/I4ovsH0Aw0t9kPiYy2Ioknz1txb+M3nccqdL4YRprj8ldrB4KlzQXVpJ3XHB9QWaOz9eQ0Vf7J1C8dlcB4YeykDn2mXOqOq2SkljA==|920 \ No newline at end of file +}//v/p9Gj+lwsQkokB3Lrq67G8zY0vHLbEfGqd1oMmFmLcV4/82Dm2NoPiwEyNRBPGV7O47/+CNCRlT7c7Y61vk2lj8xWHCxm/AqtFLfzfpAmYeh+1APaXW4xqeoP3dmnunToy1lCdxqNUAFBy1CO2eQhHfrgp3LSi3raBesbJIxiyXF4hR95pW8gMR1Hzztlv7jyDmbNK4JuPsF0nhIFMwHgFh1KCJvZx0amThjLVwezrRK0OXo15YFd1vDvKPX+KLRLTp1u9aI5YzvUArpcn4ntQsa9yWdg1ntGopyS8J+FD0wMh4ziL3u4OjM/Uj8L3jRncUipihMUVXRtrN0d3viNbg86+CbpOsBYEoo3T1x5+YOM3UJ+BPnpEs3DC50ZvxZDn5rzVcvZvYg3l8OyuybvAAXLNq0C2iIg7XuImWKPoD0vjPATKpwb3tGAbY5AkBQlPRFYgviRXFPyex5GgwYJko+bZw9VqDLXC98lVuu7vwmJl5HXrzX+f6SFPsfWJWvnz6sAXtf+VbWmnGAwPVvuXV23rq+9yM0d0Ux/JVepAQ/tsS94q25rle9mKiM4a4ZPJ4UzwgoXhjw6koDgZK2CWKQUzMHXMPiYn63q8br6r1pVblWJ/07VA4KH6MwBknkHpBI3juRd4X58ArjN2lj9cfGey8cae+R0BpRmN2VmNdVDV2RpI1OBjNeFLyd74RBbK1R2MH+AA6q7NUCFDN8Crd6Lm8vI4HfHvhxWimCC7DasMXRiFdjJdfAmB23JeauGTuE5XiNDKwby2689WrVloYEEpzdl7Ij/WFrytEH9Myq7S7V00fE/ODHn0eyzMq5zhYf4Uqh3WQtpx5cTV4aettCB098C+Xs9NF0JRuekGFAAGkQep459av/EIOtsxoRLnDJAJoUJIDIJBUdN/+2w==|920 \ No newline at end of file diff --git a/Pages/内建页面/FGC_修改密码.json b/Pages/内建页面/FGC_修改密码.json index 85c12f6b..7a9cc070 100644 --- a/Pages/内建页面/FGC_修改密码.json +++ b/Pages/内建页面/FGC_修改密码.json @@ -591,6 +591,7 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "MasterPageName": "FGC_母版页", "MobilePageName": "FGC_修改密码_手机版", "Title": "修改密码", "RowBreakLines": [], @@ -604,6 +605,7 @@ "BackgroundPictures": [ { "Name": "BackgroundPicture2", + "DisplayName": "背景图1", "StyleInfo": { "CornerRadius": 20.0, "Fill": "#FFF6F6F8", @@ -617,4 +619,4 @@ "Size": "400,510" } ] -}//oDE3RvlaDnOPULKPpbSkS34LiuBVLafepPv0nLHDtrx0avKKnye1/lnYtZ7svEiqoJMi7EYO8tyQhdY2QE+8aWlJVspQJEJxRO9x5Q1QZaoldixKmC4fS+uLF6MRYknRIHsvEVpncK1Jlzv8Ppo9+9/7YPFojs8BXp3citb4nK6zGRMATi97cn4tkVwxuPVyORTmFP18McVMk0hiRkGi/VM11tol9Do72w8x2YD+7jNkTSPx2UO9Ovc4HRIbEJ5qqUcLTczSzyRnUfaL3ukDJEnZG/oN+orl5r6g/DoREyFjk2KVm1ltnxAX7aJUMOW5OcAJigj/o1W1/gsrDj7rShSe5U6V4qvVK6RTVE0fVHTwRwJ34Iia7djr0a3Dy1GMAVFlb0yGcY0C5LpElbPit2ji9EBjfA4iBsxfhjuTUL8cLlL3vojcXGNLNLK1y6Aq6NZlVcmFqrSygdBb7booYknjLC9xrovnLETZ4QGU6FL9n4W5ost6e/7fB0LrCb2TrVR1nU5l9gzuYUHN16iphvD82oW5895+0+UwUQRhN2b7N/flt6r5LM2bCukmP0w7NIMLCwRwHm79763W2RTlkIzBQtndJhSXgeOyRvmaIN4OCHsS12laAz+j6YhB/OUuC92WmyvyemKygbGtMthUQk/y7rsKVA6BrIveddj+FsnxBXrrnUm/VpvkOyI/ClTXyP9gX8sssVNWtoQYtzhY9KqPV19WWBuPrDRm2Jut3vMTR/4+L6UpYTZvGDVe1XHTzTTshysKkIHh8P1TG9nyvdk7Ud9tS0OZLHbHmY8/0xz/T9UlkM1a10RAWdHCj5SArKux4vFLLL/lXy+Y7+I+HfK/OyJZqot3wK2A75DfF9c68egb/VshjCqT4qNXnCUyVSIOH38mFCgc0CFZ2sIsXQ==|920 \ No newline at end of file +}//N0ogpPUAk+OfIouadfTbyWDRXPC8ey8DO7TLJStsc4gSORZM0Gx512foLTMtjDPATZRBiRUqyBkqF5MBnmiVS4xBHyJBGotL/5thKKR7jt5rUo9ywSJ4BHa3ysFbE9rkv13XW7uCT8IoNcTwCjxYLkIllNfKhLwT0VJP7irj/6bKMTmE3BGTfLkhVEEHv5c8goofqwaSI1rzj/eL7W69rQ2gzx+QA/B354k7E+Pgz4uLIkLJrkOED3S+SQvdlufDcpQSD834rA0yoVUW+nPkXRxSw0ZsSz/BlSg6BDLtscL/VkbLOQCYXZvc2jAN+B63UqoVrkhFuZruh6gjVyEpBGjx6Vzyb18lncVPbP/mZVzhs9qKmkiU+3buvG4oRqNWhn3Os5+QpktYJaPYfuTNqt4lmVbT2Y5bBFZYOR8r/kuN21CNElrRiJ9LzocSze6A3/4i0IL7ozYlArDzyAfJJvc9o7cUeL5IOiRFRClm6D+g0Oum2YISgX3iH2wwAk1+rAM37XbzQYswUJi8SlICDTNhlLDBtR/5OyU9vF2mRsghBPExDofCX1RkKpEGrZLSrQU9cYPJSEGKbfrebMOV5qaQcV6uEi9U9Arvv5UN7FYyjff8xPtwdWeesenu+/dnqZsZv80xtmBOOWVhncgLBrH+TnN3od+SJJHTYlwh9JmfpwRRZYhT72yVR2G60bwwryo6S1XQ9FWRimZ5A39LcdtargqU+1yYgBouMnFXBIldK+/QPai1sQ+xZ/Ggg70KcAfoGMRMb2sZAScpDUSh1j3DrEEuOe+P9tWI3hl2upvNDXHol2QJnYcruEtpRjExYJQsKdhmKONV1O9r35vrZS8Ugr4RF2uEcO+Djst+zNGB5GheU8/lWnzxsm28BGxF4wc/GdqY2/I3CHgy+OolmQ==|920 \ No newline at end of file diff --git a/Pages/内建页面/FGC_修改用户信息.json b/Pages/内建页面/FGC_修改用户信息.json index a1e0a4ca..6d844da6 100644 --- a/Pages/内建页面/FGC_修改用户信息.json +++ b/Pages/内建页面/FGC_修改用户信息.json @@ -438,6 +438,10 @@ "SerializeProperty": "=FGC_修改用户信息!母版_当前用户" } }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "姓名" + }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "负荷", @@ -453,6 +457,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=FGC_修改用户信息!Q20" } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "邮箱" } ], "ResultErrorCodeTo": { @@ -1116,4 +1124,4 @@ "PaperSize": {}, "Margin": {} } -}//hlQ2AB0MoY5D/73UbYzPD53GmKD8xEliUWbHqttW8tgM2b9v+Bv/GE1P+kPUq7pKad9/h0yx2sO8aOTVCDTSNyAXdr0/KB/NS5qar5+2MYey5efpZOJhot80gE8gyZUuywkUl3qjCV1sP4kL098NyelX9HC98UppZKUNrSYjsDoHR4n5g5XJzs3c+ogqzkLzdiXyNfn0kMzAwE/a7agguCB7onz977R5Ctch37R1/ADsWTLgiBZW9QxLQ8h68Nfw+dmMc/IdOLwt7H6HCOYgkVNNVEm48Lchu/Y75q14IPzGN2MpVXXLJrTWFe8MA5zh9+622LO6gsq8+fnlVx60N0oSqyTPv0WF3vMAc4YYPkrGTpbyR219hD1MQ1zT2Be1JRG1Tflfqk0A5sDi98co8xPZ8MzSROOg0TGfMUEUC3Cxox5vsPsoA8vHwKro3cIzN2JAhsWOsNLWp5553GWIwbj+Ujxo4Cx01of9pcRvRsiYjobBMiAoePfsprQ/FxNx/ixpfQNlXJakPoivw6vpVeheVq3mu21HkQ9IWnJ6uRtIqz2MDst2FzyK1iAUL0A57HQ75Adu6Rvr9AzYWblJ4bGoq/WuapyoojtYvdn1vQT9sZsH6AKfHWMZF/+1SjtQlULn/RvAamdK6RM9ZFXOs6ktSEKP7s+83ZbMXlEcd83XRqunCx3RSVgmFZpJAwDue6MfRdKbb1QVry9Xyv6kZEWYadi6JoDaM5SdX6vAz/C3gCjIvWxQXTXV3BhWZeRZTmulfmgqI/GGkATiCrsd9cxG+m9mbXnOaDn84nvkHXjFeCHhqtjQHJulHsTXq/p2/1Lxg/SYbEX9i67JgHo0sE7zwQn6fPbU0eAb0qPhk13ea0JnPLEDWO+0PV0suQI71D8zqzIAyqo4b3fqZ5S5gw==|920 \ No newline at end of file +}//Yn2oRq+kzIjv+xTF/TrinM5ubkuxWFPcGqK2wXvXeKQwBo3zpqhWa22Y5WrKDJ3rgnFbW/K8YMjRIMXPEvvDCTwLNp7k2VSU9ZEtaid0NQBR89fPhXOnqagAXo2L+2JiCfFd7ajfXwY3PQIUojkrCtuZmkMJHmBXOkTXoucStcVEyf402PiOTstD+ab0PNv5BL9wk7lGQzSYR/JhG5Wmf9ub9mNgsdQHdBQOd3dxNywGA9BpENd8O5siOX3NRuEYVcWtW24JVS/8vXBipW8Oi11+vBUPgQqX2yZuwoXnpg3j6b03Z5Omge5KoZWRtINFRjujF1EmEF45D+1liCdnZkmO8ldv1hz92nRcWLIaQHGr4ofIY+IZdAcK8fhlTiDm7MPb25FVMpB0AJcTDVGyqoS7BeGhRAt/QCpoCRnFlph//URfYi5cZlgA21dlGLZQ687W2sJJ0X+VCSET5mT2rARY0Bi7wgHkAG8Lvv4gIBHsZzzSvTVMm424UKSotHEvLAYbZwrOVbue6zafR3jLxxv0I+zvHj8318hYKu5YBlc63rdZMmhn3hXJ09269Np437XBxw9MxUwRlRJTwwDQo7ytK1U8vHYrj48JIlaxtzVmlaOizN7GP3WybeGjdck7xcp7YESzT+EzccW52zKyf2fEEQF7Gh41S7xFdzSLdEgb12db5SjPjyHTbzRdHUtzXeXFH4OKwKERKZMaV8HycarpPI3gHdU5RXtbWZSm2nE4GNXfa2lfRTzYGO8TMPftApncvqXlbHWXD7+JgxP2T57ZwpS/Zr7dLy8KZeQMzkx8XNoPg1Drl48VYS6XFasUmBddM7DkhnlSCKhXQjFXvElnOiQ5u+O1iWlsKWTQUGgGgbOJp/Qi7hz2RrjIKFxv/3fJDUAZ8pGD4LZDF0T9oQ==|920 \ No newline at end of file diff --git a/Pages/内建页面/FGC_登录.json b/Pages/内建页面/FGC_登录.json index 40325324..3fbbd24e 100644 --- a/Pages/内建页面/FGC_登录.json +++ b/Pages/内建页面/FGC_登录.json @@ -524,28 +524,27 @@ "Count": 64 }, "Values": { - "6,32": "欢迎登录", + "6,28": "欢迎登录", "10,25": "账号", + "11,25": "Administrator", "14,25": "密码", + "15,25": "123456", "20,25": "登录", "23,25": "忘记密码", - "25,22": "默认账号：", - "25,33": "Administrator", - "26,22": "默认密码：", - "26,33": 123456, - "29,23": "企业级低代码开发平台", - "31,23": "打通现有软件，快速定制面向未来的个性化应用" + "29,23": "项目管理系统", + "31,23": "高效项目管理，从这里开始..." }, "AttachInfos": { "6,25": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ImagePath": "fgc_logo_dark.png" + "ImagePath": "项目.png" } }, "11,25": { "CellType": { "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "CellDefaultValue": "Administrator", "SavedValidators": [ { "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" @@ -567,6 +566,7 @@ "15,25": { "CellType": { "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "CellDefaultValue": "123456", "ShowPassword": true, "SavedValidators": [ { @@ -627,6 +627,9 @@ "FontWeight": 1, "Foreground": 2 }, + { + "FontFamily": 0 + }, { "FontFamily": 0, "Foreground": 2, @@ -666,9 +669,6 @@ "Formatter": 3, "HorizontalAlignment": 5 }, - { - "FontFamily": 0 - }, { "FontFamily": 0, "FontSize": 18.666666666666664, @@ -701,19 +701,36 @@ ] }, "CellStyles": { - "6,32": 0, - "10,25": 1, - "11,25": 2, - "14,25": 1, - "15,25": 3, - "18,25": 4, - "23,25": 5, - "25,22": 6, - "25,33": 7, - "25,40": 8, - "26,22": 6, - "26,33": 7, - "26,40": 8, + "6,28": 0, + "6,29": 1, + "6,30": 1, + "6,31": 1, + "6,32": 1, + "6,33": 1, + "6,34": 1, + "6,35": 1, + "6,36": 1, + "7,28": 1, + "7,29": 1, + "7,30": 1, + "7,31": 1, + "7,32": 1, + "7,33": 1, + "7,34": 1, + "7,35": 1, + "7,36": 1, + "10,25": 2, + "11,25": 3, + "14,25": 2, + "15,25": 4, + "18,25": 5, + "23,25": 6, + "25,22": 7, + "25,33": 8, + "25,40": 1, + "26,22": 7, + "26,33": 8, + "26,40": 1, "29,23": 9, "31,23": 10 }, @@ -727,14 +744,10 @@ "15,25,2,14", "18,25,1,14", "23,25,1,14", - "6,25,2,6", - "6,32,2,9", "29,23,2,18", "31,23,2,18", - "25,22,1,10", - "26,22,1,10", - "25,33,1,7", - "26,33,1,7" + "6,25,2,2", + "6,28,2,9" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -751,6 +764,7 @@ "BackgroundPictures": [ { "Name": "1e95a7a8-4f1b-45f3-ad6d-700656cabd40.jpg", + "DisplayName": "背景图1", "ForguncyPictureName": "PCLoginBackground", "ForguncyPictureSourceType": 2, "Stretch": 3, @@ -762,6 +776,7 @@ }, { "Name": "BackgroundPicture0", + "DisplayName": "背景图2", "StyleInfo": { "CornerRadius": 20.0, "Fill": "#FFFFFFFF", @@ -774,4 +789,4 @@ "Size": "400,500" } ] -}//yvKhFemiKT8YA7M7/wMSGyBpMupj7HgB7r59wDnehrzpn71+Ilo707p1V6rNSPsIekb9NY63DRPEeR4EWpx+S9Vrm2gkeJ3SoRrgTwVaXXwsvK6v/SlznxcerYoo9xa7jrzVbuvqiegk2fxYbyCbmFhWvSCTZLrcMVorxynb321XGCD8lN5Yb8rR9TCkf9n5FCYC38FYT+t5cauhSbfT15z3Mn4cyNlf8EXDg83gSnkF7Ow83ok/VThkjJfYkin8+RHOmdmWrkqMtdb+t6I8OgAx9q97GrBlzjrNc6JASEbTMjcAJps6Kcfilww8i3Oyyp4gSlN4npvtkjECYdAKBLMy2K3d4j0uRqA1eMQCpJpmGJe6TYDDNNrc7asLFCDg1z7mw1xTEn39JF3RPPRksVGptM35V+f6H02EdzlsQ4Uczb+1lEFWsgZ/4NcbLpbkg1I9RzMmYHXe4CzzcRmQuMa61B7V9hfJcG3VF3f60S/TP1K8LPwTLeSNRx0fB595fsDZk0kCPZ8skycASlcxgcG/tTqZFNP7Cr/d0dR1jhbfVsmQ93w5lVQC6STJSI9al0s3CJwVGOPQLugrxm1BPz3QUrztdUdnCQpUSyrtAEUL33aaqUh/76hn2VGQxdw8JT7VEqPB21GbWVZq8eFsvRQ6iaDqK2pw2VzVfnLRtPDOafwSpyFgCzTat9zNijvGR564+9N3Zp/glJEHVShmzGI9tWd24ZeOovRmHhXQVTk6y9p1NEW4/K+495nLN1NF0fGfYLyVRojtnWdIRuTwlWEDjRX6XSOpN5v7U575Ay1pn3hEG3LBB6SuzE8FD2r72BrEHtroQcVzKjBg63j0j6Zu/UPvl+smmTYosZm8STThCnu9w9ISIli3VMZtWr63XJyueclGXlohpaDd4/O0qA==|920 \ No newline at end of file +}//2jjs6vmEeOAz2t0CC6HySIYcv7/Ur5xt99By2MhYY7kiS+hj1kdNV/PRPkhBIVol9hP5NzRP0Au5wwfj9OCl7B0noc81t2aGoIUJx87EPEugib0oQ5L+Lj+LZzLfwNj/XwtzpnVavjoH5Yrf4BBXC7GbABpJTKljppUXLNfeVM9E9ZZM6/qJeRiH5J6ODDniTGPcMGVo9jRh4kbxVIxZjPnJGcFtlqscopXVOs/IEyU+Ah3QLcXRlmAUc58yZVvjzB2AMVjI6f89mNS3AmWwRE57QwQvZoXek0V38P2HOKHjHsxTqWpgKSBL9Eta5ztd001kN2ryyBRkCeQfVyAgxfjiZHJaDllDKK/XBTiQyw1CZecGd2RgVEKFjBiarae3uc90wNgz93Zt59O+22enfbFcPAs9gH0k24+1giaifflXDXcJIPi2tEFeILzRw9xzCornV+IcVuUvZy+hk3q3kQcoZoSfpat2XBoy7ZgSsPZ3solQMjtEN7yKneix7fRL4bBzVkupAqWT4kt2ibe7dcX69ZMwupfm7ZIFa8pdt5g7MikyyUdXBjl0pPFGRpXvD275mTLROGvJU2mM2zOpoPCR/jw+trj+jRM2ctOy5RQ7wQEcqSW2jVjLvy7A9cMJPi8Ge+vNVmxq+PNc4G9EleYRRr+Gegun0Wz0E+I9LzeuQgKWwN43c8Cp/hG35qame7RtN3IiSGEdxuwY1fbNcsuwTU7TA7FBO5gNHP0u+nlNZL8o34rOzv7XHw4QGgiJro5AWM9Sq4YH+7svIgzhJNqj84xluQnFYKz+6fF9OAMEduEF0As/H4D6aZgDkKbDPzvB7K3cjWKm54iwMjqWepbJGoi8nx63QzyENquDBnDJVRhWRgzZkqpUpdnFVDoUrZREj6pFbkImYudTgPRC8A==|920 \ No newline at end of file diff --git a/Pages/客户/客户管理.json b/Pages/客户/客户管理.json index 5219f6b6..ded2aa00 100644 --- a/Pages/客户/客户管理.json +++ b/Pages/客户/客户管理.json @@ -498,7 +498,7 @@ } } ], - "ID": "9863410d-5ddc-42db-aeff-6b04de72d5a3" + "ID": "46f36b2d-f636-42af-93a7-7a4f2f0619f9" } ] } @@ -806,7 +806,7 @@ } } ], - "ID": "06660f48-3734-45e0-87bd-7281dd69c0b4" + "ID": "26016078-d649-49ca-b489-b27674df2128" } ] } @@ -902,7 +902,9 @@ "minWidth": 60, "align": "center", "headerAlign": "center", + "colfixed": "false", "resizable": false, + "hide": true, "key": "1f09a71b-598c-47f0-b9f2-cf89f328d1d3" }, { @@ -912,6 +914,7 @@ "label": "客户名称", "align": "left", "headerAlign": "left", + "colfixed": "false", "filter": true, "multipleFilter": true, "showOverflowTooltip": true, @@ -924,6 +927,7 @@ "label": "客户税号", "align": "left", "headerAlign": "left", + "colfixed": "false", "filter": true, "multipleFilter": true, "showOverflowTooltip": true, @@ -936,6 +940,7 @@ "label": "地址", "align": "left", "headerAlign": "left", + "colfixed": "false", "filter": true, "multipleFilter": true, "showOverflowTooltip": true, @@ -948,6 +953,7 @@ "label": "邮箱", "align": "left", "headerAlign": "left", + "colfixed": "false", "filter": true, "multipleFilter": true, "showOverflowTooltip": true, @@ -1015,7 +1021,7 @@ } } ], - "ID": "511d96df-deea-4ae0-a2cb-8bafba6e3429" + "ID": "e6714682-51b4-4b59-bef5-6ad89a51a82e" } ] } @@ -1460,4 +1466,4 @@ "Formula": "客户管理!$B$31" } ] -}//LUUp0Hk8Ev9ZsLAE5kLRLCm0VLUhOxrGIK09D7Kiho0a7T3GR0nvDR9OB7tWlEUg99FyIrYygGK19EQz4C+QkLrfLsgy6UFhyHQj6y6NYf+01W8NXYCO0dykMNLxWXlT8wiUNxEgBbkxkYhDdFBA4wuFyS8UQ1/J+z0PhehFLyqOupPJcJ748WOzSc81ZZNHeaZMwbwlRj7ifMZ5dEj4wQSTlaFauXJc/HuSDfMGbuz2KxbJDggl/uwxHIeoicISinrzcgUMEhO7d/NXXVyEDl7E4i35rzDfWatORdR779A5Ey68SggP5GMEwvv1BWCPf7drDel0DA2/io+jYmzMdIDJBmETFEqZFFsCroEuUJlNHYsYyvdjRojaDdmR+B/WMXCNfYwzByZQ0ux1ZYnPIEkl37ThHJCw3dc1FUvYwwyJyPXa9vgRX6BLka9krLwyxk1Q8q1BUKVRrYsigd+YuphGONFvNNJPJ9i0x/U2keox3tIEQfAnLiFwik/le15vWFuMGLym/Kssg33P7J2I81Zq2FU4L/3IbzAn1GYU2RU8+Z/qeXwgzeSHTth7aahd/m26Sw/VR1ZdGzNqxPySSVfoX1wm894VDzNs0HyzXeywFmxP1aJHkVnyfi/peha3L2rOcObtjL/p4J+sF9j7mv0POYqD7p+k+lA9gsg8pcR64jDb+U1hN1trrDeR4A+rSJ/svzzBpkgQ/WBugOHEXS1CrDbRRJ6UEoHrkXq6nWR5UMiu8zss6dP9anMQ/EBra/Jiv8/7ivmdDoXDbVAtulnylaptOAR9Udoz9ezXaoYuP+usn8RdtXkEwl6D3tLrBVzN4/OC63uSPghpvjvXiUzERoV47Ill9QjV8Stc8S7kygu63M6FS11vk2JS3HhnUs2FEUzVzpsok89DH3ReOg==|920 \ No newline at end of file +}//QNi5FpQ1aecuwA9IE0mH9vdIvvdn5BeHmF6TvIRy5/I2ZVXlc5SYFImg1LVKA65hmbVP3THpByOI3MY795bgbcsV+YHY8Li35QhR9OAcosYVYoUo0EuYZblOvO3Rjt0JbpjtUZU2ij5a3yS1+uX2d8EHhMn3f89xWc640W98p3839MI/jQp3DiXtUMocPB1v320zNnd3BkDdlWYHmaPGCYV73tUUbJE+oGhNHh8AaLoqJUFzkuyV/2/XEE6huFmeHdzNlCPTmve7oY3u+LSm8J5QsZe4Q7XyuS+B6ohlV5z7/bqJ6EJg4RXez44/qvPQ7YFteTU1SHt8pRmklG0qCCg6hRElXWW+mUaQCv4PrN1fBm/XoibRsnydOJ5HZcb8uj01SsmRHJE8b4/iNnIy7GsFiQU60Vch8ma5uhpuiLAOx347Ldgz2zt2OB94jzbB7IU6+UdA5+NXwsuJgEENSR1CBS5XnRpcVeg4Em+fXE7gsqmzGorbQEA1zfB8myyBIEHRy2u2fBGOzrQL5bYzK99ULxZEIdhHt4XNZC8+NnOhwczHLKVkSOQMKR6Lq+G/A6boEISEMDp/e7fQlEtGbVYJ6wsTcJZ5iFb821f3u5NeNPbIxTpAKfzu3OuUlfhVfMe4QItOvPhsYBdRPDXKvIkcsbEdxA35jW6oKiz1sVcSRM0RAKbHAZaQmGvHR7VVtt3ZY9BpSfRz5PMTrAOMrwr4k1/dfSybWhA4qISyR1zminR8/oPACznPBBWXGYQxZuHaHIYwgcgOzeIlOXiQfO5cvsZW1znTFwlKrdmdiryt7oB5b8mSW240wVpws+34X9VbV+Eeg9XehurTtRZpKVhXk6HfmRlOM0NyIg5JftjMxhwQWJQfBtoJUi949fkxTt1ecE0H1gPAQmlGT6oaRQ==|920 \ No newline at end of file diff --git a/Pages/工时/工时总览.json b/Pages/工时/工时总览.json index a933ea27..514b9f2f 100644 --- a/Pages/工时/工时总览.json +++ b/Pages/工时/工时总览.json @@ -782,6 +782,7 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "MasterPageName": "FGC_母版页", "Title": "财务中心", "PageLoadedCommandList": [ { @@ -817,4 +818,4 @@ "Formula": "工时总览!$B$4" } ] -}//K54lmRnNE1Idu8J5eQK7iXL+1mmkyQ31GZ8P9WwX54fT/AXM6Q+i/6paG0VnrFvHsYL8uWKN9jACMR7RbeOqzWIDsZ/wJ9gZ5etGk+1egkP1HXNR+2TDzvAJYlYVPxLIW6zmYXN4axIU6+lEsAUypKcdULqL2Zb8oqaDCrlIP55O8WjlphzHCsH47fFIy5V/dsLdKR4/r7ILDmFAO+pu4Pz4/Vrh91L7fBGoMF5dPf06QIXJiS+3qa/1aKTZZqeujWHE2U1PyZRMkSQ4ATOYSLqnKdwnP9VIx/TQAqgng92ggOdpSzQ9SucjU8L9lYo0sq9sRuF34SAAXRZRxbrrIj38A+lW/osY7YW7JlRpXC6UDK+9mGclGCuqPhxOUc3vwIswpzBKV4tjjt9f6OUeaU6T7QqJtYCyjyf/9drDYXd8UsndB3NIrQr5pmlvSuH6L3+m2H68qw7YK/A5F5WksCksvb+3Mtpq/T6mb+9l8USzF0awllCL6/IGMQNPh0N2gMkGJiLQmu9FfM7cUvl0696xyi/yv0X9FY3N3Pezp8lDDRF9xszacumB7yzbEdz/rjew7FMPZcNoBUIbYLgoCIlO9VA2RBGp2Ul1dEZJr+pHquqKUSC6NcCdhEHjOiD7FQahe6sA9goaDa9RbkVutlHVkffbrcnHRDXUmL9gQwuLnUohcFfy5emKe86ug2SiTs43IdpmTUjkmuZpKybdm8ynUeRGN6R8tVheeGaiyxxE7nbFujIAynOGpvoEhK03u7i4su4yBEd2W2pK+F8pQQ6JT6ektdvKIZU6EkZgtHEhMacSDMBV05R1I4uMci7KyQqSxiXc3vU/wLObplbJICFhoxRuTF2q+afT5bN102/lqR8x+85BpKpcKB9l3MhvlN+WT3JntRUyzxkpx7zmlg==|920 \ No newline at end of file +}//WaM9hbmrTlgeg23yILZ2pLpbXOr5HdzncLugaqoFg358herEtyDvYeT/hQ8r8x9OQsnjx7Kh5qk9CWeotVTvGsVTRojXJ5Nr1s/CYqr7Hg0VoZBz/5VUnkOh6ABG5VkdO/MP7Enn12brK8oU/iOY3uvdZ94ySnWTPkvouJsSclx3TzTs5ahZQrO5r+9MPeJXY0mrh4LS11eX2P9NqlnKfer1jPGAKMTpRtl8kalHrA0XJNlLFQAhO7lRx73jYfP0WadhWIyi7Fs2i9gsvi/3+fDvhWYcRrniV7oOVLFp0ZD30dE25hJlb6afWhjGwEOyeXlIw2r1PMs/lgmdDMlyVPTYr1bacdrlhFIYYRSbVMoQ0p+ykwTbRL0N+WGR0aNFoGi4cDx3SegGSFwjEiK9ieprnvlr3B4OIzu79ms7tD2Q2bFtcKXXsIyDeSk9BOTNzISLy0ry0635Mk/8Z6bEKhcWvqieTVfOYCH0zOz95uYN+N/gHdFMU8vO9vO+LNtDTApBE6CvfQnBxs4HAX13fkRkNv5VHjHn5q05YVq8tVz7oPuCh0XZerIWr2BZRzmlNY9pQ/tQfaX7ibI6Cl+cGhCF8+EDQ11UXqvdLlZqMs4Mk19TbbRq0O6NDtJwVjUaFlTt1uuGx+HFLKUkt5HQ5Dq49bQypvUs8kxUZUZshHdPdkeJwhdvMylL2c0JaX5AReRrlTfrWRwGjoUw3io07/djbWUAslhyemTqfXw1kpuUIHWkVDp/kV4sarSbUgF8lkYEU3jRHovBRdYdzk0/2I3rKXXmUu7KVaAmO+8jzyAWuP/Kl+GmkyjiSZahs7dDoqRp8WkFVLNKBhoZ7KLoZCEF31SgEatEG4VDsqGJ3h2dCuqLzhVABLGHANuK4vPPsAiOXS/sbu+kXFOLN93fLw==|920 \ No newline at end of file diff --git a/Pages/工时/工时首页.json b/Pages/工时/工时首页.json index 27ecc388..c37afcc8 100644 --- a/Pages/工时/工时首页.json +++ b/Pages/工时/工时首页.json @@ -336,7 +336,6 @@ "$type": "Forguncy.TabControlCellType, ServerDesignerCommon", "TemplateKey": "_RS_NewFashionStyle1", "Tabs": [ - "工时总览", "任务工时统计", "人员工时统计" ], @@ -402,4 +401,4 @@ "PaperSize": {}, "Margin": {} } -}//V9MFbBKtEk5hp18jQYy3DrBeMpVJqJ5HP2jttpK7HtTy+0UaDb9juPtrnNqZJb7wccstnf8WH1UFb70WcjsVkR43qTLMpjlzHlND52s3JdmyDaRkPdveUt39ZQChctgbIQeWe5vim9bd7yvAx1FyVYaI+xO6/KQMfbotNdBoNwxFAQPnnYhKa9HqizVZRbF9JyIqUlc7pYP/0U5vU7axaVsZ2HwJwg4nhp0B1dxGy0Sl+El78wnB7iSMWx0PTOOEmlY7b6uroPiroW8t0emSzWPdfD4WMBXL2lrdfzXMZJWH1MGjccqUZ5CL8DqIALgpYrDbDvpejEl9KLZtV9z7v6DIdP42Nb4tZ0GmWuHp9wgQWem0byhwC7ncj5Te6XGYGBguxFXNcYseOGCaT9JK7Tbso9dPGy56fbrWD52GqBl09fBKAzo9Q7EM5FJUzZyQnVGmDhYZzxOTVqdrsln8el8dcJPwQzDNULefGNvQBu03Dv8E5qZvvjD3jHUNNgDkmZxoRXvKY0fvm+fvi6bd/QICFVBqsUGY5ovbyRls0Lz0XZLNI9jPUeeQvVPYbJEstcDxozqjP92QE5hWICvHeZpchD0bHuAs6jSI8pIcMOOytydQPeoqJLWUTb1PU+CondVjng4YhmZrGClnAcoLZYaAtRLlDC7pQZggM3IruiNbgnpQsdvESr/tLGru5F/rp86JbrHc6pRauUekJmBrvBeCH3bfygXXUcgKi8FK49cYEUHsY4G/cajpBBcrci6HRS8hiur/Y9g6Fseg2tnQBwfma/45gl02wUF0BQaOyRwJuwZTZo3XKSUPFZ2wZaY/LwcaRD0lX7POfEuqEQyaXLykZjbqmYwAKC1TQLSJp2TdYEH8Dbft1vc5pCmA6zEs8PFiYK/ZBhWMnbvF96VoHA==|920 \ No newline at end of file +}//Sr8Y6wr9Jjc7KmbH/yN/Z1TR1bICdFT7gb3T3N6GkLuH8c0n7FYyPK5uMgK8RGa6SSs+op9XyBIVbpDiJ51Rx+G4YeMAwzNn+rb5z2xpxaXTloJB8Z+0VedsZ6s8igSdJtsJcyYE3yLm/oY7D7DzcRBmv5fW2o48UtSNehMne97pjo7CHYWZn4JqkYUFtsqFeBEod+oHsuh+5FjADpGE/D2i16etFLVp9j+VIYAFLZowfyhMdg0YZhrBJNXDpCSLhYaJHtFl9M/2c11MpOz+cJsGedMEHSUeeAnoA3VTbWzWnIxxk0hFHH9qTvIzGcX9MtxEEQ3zfnY42uLGRA3mM2eRnoZl3D1IwOEquHbZKAfR1QLpKZ8Re/0m6dZTs0Qo0g2+N99eNhmclgRKJ4BQyfBQrKp07jGK4A0LmicrvN11zf170aECY8G2FUIR0KFgVmFEO5SHdrTNbEc+sNeEBas/biaYaHpFJiUdLDJISwaYdZuBO7IlaFjx9v4N0WoodnSnHDCrxlgMWTrOA0Cb7S0wq5npBVQlPeztIMsm/+5bXTgKiyu4i8D5W1toNVGiF8b5gzqyL5iQBCvnIpR93GsLMZm/YggO91Pm0E4PZi66LGt/DMZJFQiAR0VG3t54zuQ1HW863zl2+/ms/mTp7HjktXPUjRYJi/GwyybVLJ8mGyz3q0yqB+8bZZUzLQ8yGECxwqOLKb5wHEXwzexWlw6DyIDYvM1YZzzkCqqvJjFkaIm7roPV+ozP414hK8HXPeDAQItdcRdAcwZacwDdnzV+zM6CEsalM+L7NJmGL1CXi214myGQ3RQpEc79VIR79J8k1jbdXBs+GRi1QBb6rk18dv6i7ukHoYPLDiMIrE6WwzLYl3Lzf/vPlAMlIkUJO1EQuw9C0arDBqH2v6LIoQ==|920 \ No newline at end of file diff --git a/Pages/收益/审批结算申请单.json b/Pages/收益/审批结算申请单.json index 89bccca8..9b22977f 100644 --- a/Pages/收益/审批结算申请单.json +++ b/Pages/收益/审批结算申请单.json @@ -387,6 +387,9 @@ "width": 60, "align": "center", "headerAlign": "center", + "colfixed": "false", + "resizable": false, + "hide": true, "key": "507db75a-ef63-4d9c-9108-32f531b6bba8" }, { @@ -397,6 +400,7 @@ "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "left", "key": "e67c50d0-22c7-45ff-b9fb-4d63459443b0" }, { @@ -405,6 +409,8 @@ "label": "项目名称", "align": "center", "headerAlign": "center", + "colfixed": "false", + "showOverflowTooltip": true, "key": "6d7731f8-8ff9-4011-af60-eed75614f5bc" }, { @@ -413,14 +419,18 @@ "label": "任务名称", "align": "center", "headerAlign": "center", + "colfixed": "false", + "showOverflowTooltip": true, "key": "f4f6ad57-3367-466b-9a73-3e5a9d01f060" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "核定方式", "label": "核定方式", + "width": 100, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "e4938a5d-fe57-402f-998e-5580dc159a61" }, { @@ -428,9 +438,10 @@ "dataColumnName": "时薪单价", "label": "时薪单价", "formatStr": " ¥#,##0.00_)", - "width": 120, + "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "7ec6e191-4b18-4380-9dd8-77b20fcafdee" }, { @@ -438,18 +449,20 @@ "dataColumnName": "提成系数", "label": "提成系数", "formatStr": "0%", - "width": 120, + "width": 100, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "a849e367-79e0-45ad-9a9a-285a0f1abb3f" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "核定工时", "label": "核定工时", - "width": 120, + "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "48a9e9c7-1719-46fe-adea-de68a63d6125" }, { @@ -460,6 +473,7 @@ "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "2c255bd0-201a-491b-a719-34387d8d50ea" } ], @@ -887,4 +901,4 @@ "Formula": "审批结算申请单!$S$2" } ] -}//FpR6RBp4vS3g6qgUQ9zSd/Yr5C+F+yhiVSSpgFgiIZv8O6t3QyLOLiI7/nmuhbIheX+yqyinB3jJrPVv55DErnLZhekQQphb8GtRV18vUiDcNw5vP1CHCeXf+HECHbFYMG4E4XXba6S4CbIfEyiaEMrcegOweqqAGrqFSgPXeWzPamv78r/mlZRdxR0PqHwIQfvRlrsjV+LZKAh6SZeC0quBx8btyeV9qZqinNo3nfMCfM7+x+ursEbUbHKzCcSRmLcQ2dflQXL4zIQIJPJRFkYlYanVBWWBP/gKRwgaGbFHqk65dYt7YjsJwrirfsRNhyNfn8hIlc1ixhRUDUWfHuB/ceIHAj3cWRwPs8JLVdCFIiNo6fhabua+57JAQlU9B1jIxqoznx3uw5rSbP6mTF8n4OUGpayIPTJ7Jn3FOb/+NnhRCjhasIJ0kyrDTe+FclRgaijfb8bCbgacY9f+2DeEo6TsDitx9e/UVG+x+BOrRSyiCNUoZ+i44T2/IJu5aY4159cbwc0DoLNmhhD/77XbOUnhuhcp59OMAcGcuA3Nu7bZg3hdv/e5RkIqGXNS8ejuKgQ7QZM/uQywQf/+wb1/2j37vrosifCU5iv3VD/SoN5Xm+JNyrBkXUVPGjJdnzahHYYuh5rSXvp1FQfwZ25AW5sL8r/Yfi+sNUxuoBRIYDDhJyP4PtR0l0OEJiJ2P/he1XGpOWonOF3OpNJeA1+755xCnpBIRMzKzuTPUG0z3+R2c5uZsYHbJWMhLJxZQI4hyB/uFZ8LpqrhjkF+fhVRgOr10+e9tlQOsMFVy36ztLGdUVElgIaNDulgJbegq9h0lHoyEJ493G5pmvn7PGN2gANl1MIs5VrIKz66+csTry7O2aXI1/ePpazkz3engjGH06qq82SmAM6H4I98zQ==|920 \ No newline at end of file +}//1hnx3qsxNU3fk9HlFs0yT/uyacDEIl5Si4zI3RltBZn+s8F7H7u+fXg6Vu+YDl+QDCDyPSu9U9vF+Ta0nQVGilJ9i55JZSWzfmksvJcnyn+T5RhYbV1XZjdgMaZdtjbESZQZK2AEn1Owtsd+w5THenYyUV7hvbRk62L5b4vKnemwOUBgPYKBGcSRo7ACXlRNCZvuD2rbvbROaWkvAJ+yEL5p80dPIn7dv6K7W6I0/Q7f0CEvn7Zp2+ZuCxGEcdf2IP/tL6VabCaKGiEfB+ntSZk2V4qqZTAk6DjPSKcnOuQrrnImVWup9L/EvG8TFT1x8Z59IeQzxqSDChXF4NhwCBqLonhBMmu30iDQ4kpucdX08N1igQgskk1/vL2vDSmFMdwBLbzWDXwAP7cFuL0PGFbh+PSnqd53iT+5Wk3zd4YsWI3IqCI76FEyWOylhJdGdPQSHCYXN0K/0luXXKUOML86qU9g9oNqoVvAJG+LOMBbTANfWP+S5RnYEAzhFgrj1hk/2eHFr7I/TNTJ6VpGo4HITqq9N030cmGXUqLnpIQHDXgjAoMkY/TIcZcYOm+Ul5ts+FWDLkKLv/5RJINGu3bXQ6bS6S6PckWMFhYT0RwL4vwqcDQBT8xEKJ/IIPrlELae1UZRC2sIaDPGWUC728at1eXhX3L36Qt6459NuY4rG58l8zO+ceAVtNqAIxJbNeoHvQB5JuEC8FOdNWJyptAzq5YeT97sCSbYS7zzKvlDqtrLGn5c2PP0kDihBz40Q6i9Zw5fuaZMo417ak9Ri828r2PZ+lBlOWP7xXK7VYovPWUH25Qsx/Dm8eYhzUqjNBcawaCv9jdEaafykyhGA2s8q7RwoL5Kwv/41YpagKh/rtVrn+NFdkP8SV+nmrbvETC59hyRmbmJoGU9OKI33A==|920 \ No newline at end of file diff --git a/Pages/收益/收益中心-变动记录.json b/Pages/收益/收益中心-变动记录.json index 400b1721..a7287e5b 100644 --- a/Pages/收益/收益中心-变动记录.json +++ b/Pages/收益/收益中心-变动记录.json @@ -8,7 +8,7 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 24.0 } }, "2": { @@ -150,7 +150,14 @@ }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "20": { @@ -200,14 +207,7 @@ }, "33": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "34": { @@ -228,7 +228,7 @@ "1,1": "变动记录" }, "Formulas": { - "1,34": "IF(C8,H8,G8)" + "1,34": "IF(B8,下箭头,上箭头)" }, "AttachInfos": { "1,34": { @@ -241,11 +241,11 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='收益中心-变动记录'!C8" + "SerializeProperty": "='收益中心-变动记录'!B8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('收益中心-变动记录'!C8)" + "SerializeProperty": "=NOT('收益中心-变动记录'!B8)" } } ] @@ -265,6 +265,15 @@ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", "TableName": "收益变动记录表", "BindingInfos": [ + { + "GUID": "0049fbf5-4c9f-414a-9a69-abf4f744afad", + "BindingInfo": { + "TableName": "收益变动记录表", + "ColumnName": "ID", + "GUID": "1af935a3-1647-4d87-b164-66e81b0dde42" + }, + "ColumnName": "ID" + }, { "GUID": "4ea27372-ce37-4a5e-a806-7ca199c52183", "BindingInfo": { @@ -274,6 +283,57 @@ }, "ColumnName": "日期" }, + { + "GUID": "e4875160-0c67-4f15-afc4-cf45666f6610", + "BindingInfo": { + "TableName": "收益变动记录表", + "ColumnName": "来源", + "GUID": "34dc00f4-e0a3-41ed-9324-0fbe0c30e909" + }, + "ColumnName": "来源" + }, + { + "GUID": "910b3b29-ce91-4d7c-94f1-597d9f97c57d", + "BindingInfo": { + "TableName": "收益变动记录表", + "ColumnName": "来源ID", + "GUID": "4c11adf1-59d6-4614-ab32-2eae7004cfa2", + "RelationBinding": { + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "户名" + } + }, + "ColumnName": "户名" + }, + { + "GUID": "70c8d666-95e3-4392-b621-bf4b118f1176", + "BindingInfo": { + "TableName": "收益变动记录表", + "ColumnName": "来源ID", + "GUID": "e4f40bde-f1e4-4aae-9084-fde2260b4d1b", + "RelationBinding": { + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "帐号" + } + }, + "ColumnName": "帐号" + }, + { + "GUID": "1a7a7ed2-8dd4-4bf5-bc92-eed27f934792", + "BindingInfo": { + "TableName": "收益变动记录表", + "ColumnName": "来源ID", + "GUID": "5d7a754c-e853-42a1-a9a7-58c65b15660b", + "RelationBinding": { + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "开户行" + } + }, + "ColumnName": "开户行" + }, { "GUID": "90dd1208-b15c-4a6d-837e-7d36e1d10c39", "BindingInfo": { @@ -287,15 +347,6 @@ }, "ColumnName": "经手人" }, - { - "GUID": "e4875160-0c67-4f15-afc4-cf45666f6610", - "BindingInfo": { - "TableName": "收益变动记录表", - "ColumnName": "来源", - "GUID": "34dc00f4-e0a3-41ed-9324-0fbe0c30e909" - }, - "ColumnName": "来源" - }, { "GUID": "1f2cd1f7-99a2-4127-a7ea-a1b3aa2c3c5d", "BindingInfo": { @@ -342,45 +393,97 @@ "columns": [ { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "日期", - "label": "日期", - "formatStr": "yyyy/MM/dd", - "align": "center", + "dataColumnName": "ID", + "label": "ID", + "align": "left", "headerAlign": "center", - "key": "a939cf87-a11b-4a4f-a382-69a98ff61f37" + "colfixed": "false", + "resizable": false, + "hide": true, + "key": "a27a94e2-4ae6-4815-b020-597af24dcc7e" }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "经手人", - "label": "经手人", + "dataColumnName": "日期", + "label": "日期", + "formatStr": "yyyy年MM月dd日", + "width": 180, "align": "center", "headerAlign": "center", - "key": "428a5a38-3f4a-4739-999d-71aad1deb536" + "colfixed": "left", + "key": "ff0823f0-e986-40e8-81b3-88d40e4089f1" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "来源", "label": "来源", + "width": 150, "align": "center", "headerAlign": "center", - "key": "ce92741c-a573-4feb-b5ba-efb700514ee3" + "colfixed": "false", + "key": "83b181ac-0c12-48e4-badf-75234c14513a" }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "金额", - "label": "金额", - "formatStr": " ¥#,##0.00_)", + "dataColumnName": "户名", + "label": "户名", + "width": 150, "align": "center", "headerAlign": "center", - "key": "62d0ab20-9402-46c2-83ab-d8a05d263c4a" + "colfixed": "false", + "key": "1c8795c5-706c-4e75-b2e2-28d4f03b5d6f" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "帐号", + "label": "帐号", + "width": 150, + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "key": "b39a13e0-c434-43c5-b301-d4f87ff3d22d" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "开户行", + "label": "开户行", + "minWidth": 200, + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "showOverflowTooltip": true, + "key": "db739ea2-2281-406c-aabf-d4a2d0466057" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "经手人", + "label": "经手人", + "width": 150, + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "key": "392985da-6724-4fed-8f23-c47f0a8b50a8" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "备注", "label": "备注", + "align": "left", + "headerAlign": "left", + "colfixed": "false", + "showOverflowTooltip": true, + "key": "15a5be7c-3643-43b4-8973-ce9cfb30d0d2" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "金额", + "label": "金额", + "formatStr": "¥#,##0.00_)", + "width": 150, "align": "center", "headerAlign": "center", - "key": "35e484ab-4114-47cf-8226-c7385cf0b4f7" + "colfixed": "right", + "key": "471c7af1-30b4-4084-86a5-e51ed4a5d8d1" } ], "showActionButtons": true, @@ -408,23 +511,14 @@ "pageSize": 15, "pagerCount": 7, "layout": [ + { + "layoutItem": "sizes" + }, { "layoutItem": "prev" }, - { - "layoutItem": "pager" - }, { "layoutItem": "next" - }, - { - "layoutItem": "jumper" - }, - { - "layoutItem": "->" - }, - { - "layoutItem": "total" } ], "pageSizes": [ @@ -445,11 +539,13 @@ "value": 100 } ], + "prevText": "上一页", + "nextText": "下一页", "small": true, "hideOnSinglePage": true } }, - "7,2": { + "7,1": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "收起", @@ -461,35 +557,17 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='收益中心-变动记录'!3:6" + "SerializeProperty": "='收益中心-变动记录'!4:7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('收益中心-变动记录'!C8)" + "SerializeProperty": "=NOT('收益中心-变动记录'!B8)" } } ] } ] } - }, - "7,6": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "收起", - "Size": 18, - "ImagePath": "收起2.svg", - "UseCellForeColor": true - } - }, - "7,7": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "收起", - "Size": 18, - "ImagePath": "下拉2.svg", - "UseCellForeColor": true - } } }, "StyleDatas": { @@ -499,22 +577,24 @@ "Foreground": 0 }, { - "Foreground": 1 + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 2 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 3, "TextIndent": 10, "HorizontalAlignment": 4 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "HorizontalAlignment": 5 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 3, "Formatter": 6, @@ -522,17 +602,20 @@ "HorizontalAlignment": 4 }, { - "FontFamily": 2, + "FontFamily": 1, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 1, "FontSize": 13.333333333333332, "Formatter": 7, "HorizontalAlignment": 5 }, { - "FontFamily": 2, - "FontSize": 13.333333333333332 + "FontSize": -1.0 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "Formatter": 8, "HorizontalAlignment": 5 @@ -541,8 +624,8 @@ "Types": { "Strs": [ "black", - "Background 1 -25", "Body", + "Background 1 -25", "Text 1 50", "Right", "Center", @@ -623,25 +706,26 @@ "6,32": 2, "6,33": 2, "7,1": 4, - "7,2": 4, - "7,5": 5, - "7,6": 6, - "7,7": 6, - "7,8": 5, - "7,9": 5, - "7,10": 5, - "7,11": 6, + "7,2": 5, + "7,3": 5, + "7,5": 6, + "7,6": 7, + "7,7": 7, + "7,8": 6, + "7,9": 6, + "7,10": 6, + "7,11": 5, "7,12": 4, "7,13": 4, "7,14": 4, "7,15": 4, - "7,16": 7, - "7,17": 7, - "7,18": 7, - "7,19": 7, - "7,20": 7, - "7,21": 7, - "7,22": 6, + "7,16": 8, + "7,17": 8, + "7,18": 8, + "7,19": 8, + "7,20": 8, + "7,21": 8, + "7,22": 5, "7,23": 4, "7,24": 4, "7,25": 4, @@ -655,14 +739,14 @@ "7,33": 3 }, "SheetStyle": { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332 } }, "Spans": [ - "7,2,1,3", + "3,1,1,34", "5,1,1,33", - "3,1,1,34" + "7,1,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -695,8 +779,8 @@ "Fill": "Accent 1 0" }, "IsAutomaticFill": false, - "Location": "3,21", + "Location": "3,20", "Size": "3,18" } ] -}//933Xo2UIuwgjqyd95nJHxfjYa8VZ3iW0I7N1tMpj16YUAUxzEm78ceEPBpaVBY/eKZPGkqhpn8uJIZFzvSjbGAWmy0jh0rZ6/5x2RZ1Msc1Wwud3+b2WwxpSGG9RrGqh991a4BYg21yVH60RKpqxKDe3l2xsv7MY7EOODWokpFbErHD0cN5CAdjNgevtP8z6VVQkbZIMTelmiMfhcJ7EQDImSoFnUNJIn29PrzjLTq1WHOAo6DKUKtc1L9l55/RpQ+nOSGG2r+VGd9KWW6ojw/5EH73Nrap8s7hP8NBrMGoTnCkOL700jmh9RMex8fL1+AjzNOo8blTYBpjcAB1wAp2RcB87AXlyPb6QpGUky3O1KRseEcaZPxmIdekPfNq8uS+21AvfmQOQJzXjYxWVXti/AX4aSDRJYJG5/F8QPHnWTKGjeMhLyOMTw7IbIUyL06cONDmY2yVGvBpiw18PYJqitHuw0jhzPo6Rf9OfV+ZO8GTaXMNOLENOB80fDlKqrBqpe9FkFmbnT8ROMv8TUogEjQ5wrdA5R+tFNkSB1aKng5RKfINwkkf9x5ujHnYPBxA6UrLRQOWgb6QGNUpqDGhz8ZAf5hj3CnfUiikOqTiYugKDic1dkHFXZnVrFtf4g1GXtQcYrhRiRqVo4gql+ooJaTdaBrEl1JoSC+m8xWd9mCkQ3NgpSDv1o6r9Hn0b0zxkzHKcsChMR4Y8HisrU2hSe5Jdt3wA6ei+2msI+xYMAjuR1B00m8y8TBzgzc1vG6tvPgiNcqSZM4C4bOqzgO9bVer1eZxyYDxR4UAilb3zkCV9H6GPYu23a0wXtN0kMpMgjJgzGHCqG9Xa7dCl+2lCi5BCu9y/on/FrtRzsq8Y5ffVyqxRWodZ0Zku+RRRuNSiz8OFK6Hp4PZfHcSZrg==|920 \ No newline at end of file +}//Rh/9RezrvJ+wW/N9TLdoQogmtIGBY/6XSepzE1OqCLZeJ2PnXFrNzc/TrON8YNQzKvbmbzSCcMER7fYld2OQftoSGRUy5dz+0zP+DBhX9wB3aCeniKPsRBJEnluQkFzbn9hOhUJDwm4LOBB7j/h5GAT2XsvyYBjftLWiR2XwBfrkLx+dAKlWX5XiX55lNNg1YfpBVqAi/s5KdmpBM315UsCJ3yFuW+ZDF+y9u4BABRXlQl9HjQOIU8tFjdHVVgIhyk3WW0ulCYidCfx6oybvDBw7cMm5rPeZXU1NWEMPCKtMOiN73ITenR2Kh+Q6mUUTtg/DuRefHzDUA6CQ50fwo6pi3qzxy6PRzhINEk8If7FpJ/xBdKuVlahg2qs8BO1c+2JBZrvdzZX09CUgDf1qTAsgFyrFD8iWzphE0rlGFyaJwSStewNYx94xHJR9hMcEI4nzA5HC5JneZokQfHGsRAo1oMYvd90qfS7wvfpeatpEmUV07m24imkEjg/kdom13zxxhAZJF/l8UKgvbPkOMOHWXUffFnLvoQGVdXLF/uvQ7W0JBA47/d9cqQ17KMfZbTFbT9FB1R/qO8SCPAfXXhiTlYOWOq+8bSp2uCV8eSOj8D/XCqJQQcq23ldYghCQjl1GUJMUDnc0ADzG5FuAheS4I+xoJJ6z3k8q06UaW4DKVABzssoKg9ycsUgO1XTugNIAbFi2B/mmtytmrGtoT5FM0PJeVBKURsD6jb3vPClEjGpeXvB9hWodq/fvY6vFFGaUSFnuq5e2M1Oie6R0r2eZEHTOQgD0YtKlIDhlDa3aY2s3Yoza7NnK7PnVDTBl+tI2+c3sNg7NF7wDvo2sM+FjAUZzXHSeMLqGeyU7GiyDVh4/dNX9Nh2KSxUyGAr9eHMQdRGRdBtDUcUyvZhFcg==|920 \ No newline at end of file diff --git a/Pages/收益/收益中心-变动记录.rd b/Pages/收益/收益中心-变动记录.rd index 68d6d771..6962a50c 100644 --- a/Pages/收益/收益中心-变动记录.rd +++ b/Pages/收益/收益中心-变动记录.rd @@ -3,6 +3,6 @@ "ColumnCount": 36, "RowCount": 8, "Formulas": { - "1,34": "IF(C8,H8,G8)" + "1,34": "IF(B8,下箭头,上箭头)" } } \ No newline at end of file diff --git a/Pages/收益/收益中心-收益明细.json b/Pages/收益/收益中心-收益明细.json index 51675433..facc1061 100644 --- a/Pages/收益/收益中心-收益明细.json +++ b/Pages/收益/收益中心-收益明细.json @@ -8,7 +8,7 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 24.0 } }, "2": { @@ -150,7 +150,14 @@ }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "20": { @@ -200,14 +207,7 @@ }, "33": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "34": { @@ -228,7 +228,7 @@ "1,1": "收益明细" }, "Formulas": { - "1,34": "IF(C8,H8,G8)" + "1,34": "IF(B8,下箭头,上箭头)" }, "AttachInfos": { "1,34": { @@ -241,11 +241,11 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='收益中心-收益明细'!C8" + "SerializeProperty": "='收益中心-收益明细'!B8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('收益中心-收益明细'!C8)" + "SerializeProperty": "=NOT('收益中心-收益明细'!B8)" } } ] @@ -265,25 +265,6 @@ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", "TableName": "View_任务工时统计", "BindingInfos": [ - { - "GUID": "863f3cbe-1122-4f2a-acd4-ed063deea00a", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "请款单ID", - "GUID": "79c617c1-9810-4bd7-9a5a-74ce496f383b", - "RelationBinding": { - "RelatedTable": "收益请款单表", - "RelatedColumn": "ID", - "DisplayColumn": "状态", - "NextRelationBinding": { - "RelatedTable": "请款单状态", - "RelatedColumn": "状态码", - "DisplayColumn": "状态" - } - } - }, - "ColumnName": "状态" - }, { "GUID": "4bf13368-5496-4615-bc7d-d6919977d6d1", "BindingInfo": { @@ -293,6 +274,20 @@ }, "ColumnName": "日期" }, + { + "GUID": "2089af2c-0554-46a0-8dd2-89dab81262c8", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "a4f78ee3-5086-45da-8de0-29e2970c0842", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目代号" + } + }, + "ColumnName": "项目代号" + }, { "GUID": "41e2be22-4fb1-4eda-87f0-5225b99d5861", "BindingInfo": { @@ -366,6 +361,25 @@ }, "ColumnName": "计算收益" }, + { + "GUID": "863f3cbe-1122-4f2a-acd4-ed063deea00a", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "请款单ID", + "GUID": "79c617c1-9810-4bd7-9a5a-74ce496f383b", + "RelationBinding": { + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "状态", + "NextRelationBinding": { + "RelatedTable": "请款单状态", + "RelatedColumn": "状态码", + "DisplayColumn": "状态" + } + } + }, + "ColumnName": "状态" + }, { "GUID": "1f9a961a-bf9f-483c-87fe-1457fe022208", "BindingInfo": { @@ -416,48 +430,61 @@ }, "autoGenerateColumnsByDataSource": false, "columns": [ - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "状态", - "label": "状态", - "width": 80, - "align": "center", - "headerAlign": "center", - "resizable": false, - "key": "be272a80-5d76-4e7d-93e2-c09672b2b763" - }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "日期", "label": "日期", - "formatStr": "yyyy年MM月dd日", + "formatStr": "yyyy/MM/dd", + "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "left", "key": "58aaf29e-0c90-4337-bc4e-8b006d4a4e1f" }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "项目代号", + "sortable": true, + "label": "项目代号", + "width": 150, + "align": "left", + "headerAlign": "left", + "colfixed": "false", + "margin": true, + "key": "6a4f4652-953c-461c-9f78-ffabf66854ca" + }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "项目名称", + "sortable": true, "label": "项目名称", - "align": "center", - "headerAlign": "center", + "width": 200, + "align": "left", + "headerAlign": "left", + "colfixed": "false", + "showOverflowTooltip": true, + "margin": true, "key": "f1a89135-4d91-480c-801e-049415d4bd3e" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "任务名称", "label": "任务名称", - "align": "center", - "headerAlign": "center", - "key": "6a4f4652-953c-461c-9f78-ffabf66854ca" + "align": "left", + "headerAlign": "left", + "colfixed": "false", + "showOverflowTooltip": true, + "key": "5f87f23c-0495-438e-b6c1-d354759e6082" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "时薪单价", "label": "时薪单价", "formatStr": " ¥#,##0.00_)", + "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "677f0074-4d1d-4a70-add2-e7a49be982fb" }, { @@ -465,24 +492,30 @@ "dataColumnName": "提成系数", "label": "提成系数", "formatStr": "0%", + "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "28677349-10aa-4cda-9436-a2e055424c34" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "计划工时", "label": "计划工时", + "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "251f9bee-f03c-46d3-ae94-a9ceefceaba0" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "实际工时", "label": "实际工时", + "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "471fb750-abeb-47c5-93b4-b9a254616ad0" }, { @@ -490,10 +523,23 @@ "dataColumnName": "计算收益", "label": "计算收益", "formatStr": " ¥#,##0.00_)", + "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "5624fac4-3744-4207-a9f3-a91accc3b041" }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "状态", + "label": "状态", + "width": 80, + "align": "center", + "headerAlign": "center", + "colfixed": "right", + "resizable": false, + "key": "be272a80-5d76-4e7d-93e2-c09672b2b763" + }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "ID", @@ -501,7 +547,9 @@ "width": 60, "align": "center", "headerAlign": "center", + "colfixed": "false", "resizable": false, + "hide": true, "key": "cfe56898-f6fb-4c03-83a2-860d06be6541" } ], @@ -545,7 +593,6 @@ "operationColumnWidth": 100, "sumText": "合计", "size": "small", - "showIndexColumn": true, "border": false, "stripe": false } @@ -558,23 +605,14 @@ "pageSize": 15, "pagerCount": 7, "layout": [ + { + "layoutItem": "sizes" + }, { "layoutItem": "prev" }, - { - "layoutItem": "pager" - }, { "layoutItem": "next" - }, - { - "layoutItem": "jumper" - }, - { - "layoutItem": "->" - }, - { - "layoutItem": "total" } ], "pageSizes": [ @@ -595,11 +633,13 @@ "value": 100 } ], + "prevText": "上一页", + "nextText": "下一页", "small": true, "hideOnSinglePage": true } }, - "7,2": { + "7,1": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "收起", @@ -611,35 +651,17 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='收益中心-收益明细'!3:6" + "SerializeProperty": "='收益中心-收益明细'!4:7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('收益中心-收益明细'!C8)" + "SerializeProperty": "=NOT('收益中心-收益明细'!B8)" } } ] } ] } - }, - "7,6": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "收起", - "Size": 18, - "ImagePath": "收起2.svg", - "UseCellForeColor": true - } - }, - "7,7": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "收起", - "Size": 18, - "ImagePath": "下拉2.svg", - "UseCellForeColor": true - } } }, "StyleDatas": { @@ -649,22 +671,24 @@ "Foreground": 0 }, { - "Foreground": 1 + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 2 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 3, "TextIndent": 10, "HorizontalAlignment": 4 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "HorizontalAlignment": 5 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 3, "Formatter": 6, @@ -672,17 +696,20 @@ "HorizontalAlignment": 4 }, { - "FontFamily": 2, + "FontFamily": 1, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 1, "FontSize": 13.333333333333332, "Formatter": 7, "HorizontalAlignment": 5 }, { - "FontFamily": 2, - "FontSize": 13.333333333333332 + "FontSize": -1.0 }, { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332, "Formatter": 8, "HorizontalAlignment": 5 @@ -691,8 +718,8 @@ "Types": { "Strs": [ "black", - "Background 1 -25", "Body", + "Background 1 -25", "Text 1 50", "Right", "Center", @@ -773,25 +800,26 @@ "6,32": 2, "6,33": 2, "7,1": 4, - "7,2": 4, - "7,5": 5, - "7,6": 6, - "7,7": 6, - "7,8": 5, - "7,9": 5, - "7,10": 5, - "7,11": 6, + "7,2": 5, + "7,3": 5, + "7,5": 6, + "7,6": 7, + "7,7": 7, + "7,8": 6, + "7,9": 6, + "7,10": 6, + "7,11": 5, "7,12": 4, "7,13": 4, "7,14": 4, "7,15": 4, - "7,16": 7, - "7,17": 7, - "7,18": 7, - "7,19": 7, - "7,20": 7, - "7,21": 7, - "7,22": 6, + "7,16": 8, + "7,17": 8, + "7,18": 8, + "7,19": 8, + "7,20": 8, + "7,21": 8, + "7,22": 5, "7,23": 4, "7,24": 4, "7,25": 4, @@ -805,14 +833,14 @@ "7,33": 3 }, "SheetStyle": { - "FontFamily": 2, + "FontFamily": 1, "FontSize": 13.333333333333332 } }, "Spans": [ - "7,2,1,3", "5,1,1,33", - "3,1,1,34" + "3,1,1,34", + "7,1,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -845,8 +873,8 @@ "Fill": "Accent 1 0" }, "IsAutomaticFill": false, - "Location": "3,21", + "Location": "3,19", "Size": "3,18" } ] -}//b5K2ig0EjrfEXMTAcmzPy8sHeLkn+GaBhhpUADpRB3bv3wwsoQfPmQ2mBxnkYtzOLA2db4uFbrlsljcIT9OIM7J31pWLoh+fhgqi7T2khp0eeIAn8TdQdMAth3pu7+NOdz9wuN7F4tbGM4TP20tUmhJKF+ciKHGsov/AHGyEGlrcUIFG/9e2J58khgWdQMuGubHHW9FN2+JrP0yOfmk3XUopaSGsx43cLW/QQC8qfaDGM2JvGAm8RbX6iopI9yseMCe3bCeiSRSyTFgDWB+wco0Qf7agW3ts2JoQBuVgggFSwBWkIHjgR36G5qgMfuCsLoMUj05sL1gR1KHu1PNtLfmkO4MGdoAQ76ec1P6Nmel7RAppowZ9RwRiN88Uy7/XlzVW7zpaAcO9P/mI5e6voVHAkdCerINSx1ttIbwt8F1ng6taq9RcARaH3RaaKvujcJrLeps30pb8zmPzfHp8Q7NQoVntnQt9DcbUrCkX7ugXHTZx78VJ0cHARwIe/of27McQsAFzYUPt3DwimYE7FuUDGV90hnmCUJh7uCQQokdJooJcbJEYGUMB1nOZ0+kps+1LMSui/4d0W0LwA7JnKFnG/vD5K6hmij99xLW7fV4S4Y714Dhso8xq9rlrnKpECmZt5sPcXwA6Itg47X7Y+aNdEz1fnuJsZLlhSjUx3GxFvrfQYKTcqozHzUVsikOmbrfsFys/mDXWFJmNRRHpf2Ftqj1V96aoHY97yCJ5BH2Rau7cmojHQgm2g/G4dZiQgXFbefuLBtOTH01q5hiN+srp6zVLsCxf36cp7pFPJE0IPmYcQY7W4YsF/amNxlZ2dNm+3QOWw/kETQThn0DspAhRUQiZJEo/4WE9cAZntBbUNzLFjNakgj8I+wAYs+Q86D7E+t3/4XJv6ZoyswQkbg==|920 \ No newline at end of file +}//W6quvASgRQnmfiCHgBLRZqPqauoVrYaewW7kwwSfh55mcwfUZmPv++TwBQ6SpOfA6CsmmMez/fXKStR6gmiTUg53v08tgi7omO4/TMA5voB7ga9IWNndIfM38IHK+PoDwyhAcq/S3JkB9hTwKCdgJlwRsKH6TlFN90hz73PinQrxxOfFc4ncWpX/L80zYA9DHklz+thPfZBuOAdB8ah8Zt9tt1RErbRmuMqoovmisK0cyMPhnK/fd3ChISiycnbGsAUGFfvwdSaxlwWazwo43hZm8VwcrKV7srdSA+RYbS6jJyNDvg6fsuPVNwC/389MY8nHKDzwsmlYkvPDQayUq35QvMP68KtcnlDT2v15oDeYH21KpRGfgeEzRlE8K8QAzKMJQ5gtIrIHdRQ3x7rKGhANDXY0hrmsNeBCCfDBDJD2o22DzL1dZ2tL6t2B6PU4AX91rQ/6cDALrdNKAevJDrPpihATUM+BJjG++qjN39ZinxwEv5Yhg0dmiqSzQgNQC+/bCQ3aLpR0yR5Ann5RuXImWV5pUkGmm8IVAyr8k/f1mBtCk6T7dTFjZM5D7LwvOKbM9W2gBlxlnKxwxXhqvcmGrLPVNL8dzTzWEGoe6mzsGdk0UUdT04Z/QkR9FhuGJAPkM1+avhM1vtDrVulzYO731V/HmwdgyNNo4xrCyu/PFLydy4ZNg4BIjTrVI1mBqHL0NoMBrFxGXQwm+Jg7tb0c4h0PoPU5aaa84aqPEf2gcbwdnw2DRyX0B3gejseb9vq4tkG9G3k91JIVBBsrxUQ3770GobZRH1CwfR4hwyzShlCmjz9LwQGHWtVV9U9JDSKvQchMBMH6DV5zyH0cJcTpzSKgaQplEbGCp1c9AQ12lyD73EFpENgQ6w3B6onBMmg2zfo65CxyZ/pebPmQpA==|920 \ No newline at end of file diff --git a/Pages/收益/收益中心-收益明细.rd b/Pages/收益/收益中心-收益明细.rd index 68d6d771..6962a50c 100644 --- a/Pages/收益/收益中心-收益明细.rd +++ b/Pages/收益/收益中心-收益明细.rd @@ -3,6 +3,6 @@ "ColumnCount": 36, "RowCount": 8, "Formulas": { - "1,34": "IF(C8,H8,G8)" + "1,34": "IF(B8,下箭头,上箭头)" } } \ No newline at end of file diff --git a/Pages/收益/收益中心-收益请款记录.json b/Pages/收益/收益中心-收益请款记录.json index 3fa94374..27d7ecca 100644 --- a/Pages/收益/收益中心-收益请款记录.json +++ b/Pages/收益/收益中心-收益请款记录.json @@ -8,7 +8,7 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 24.0 } }, "2": { @@ -135,7 +135,14 @@ }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "17": { @@ -200,14 +207,7 @@ }, "33": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "34": { @@ -228,7 +228,7 @@ "1,1": "收益请款记录" }, "Formulas": { - "1,34": "IF(C8,H8,G8)" + "1,34": "IF(B8,下箭头,上箭头)" }, "AttachInfos": { "1,34": { @@ -241,11 +241,11 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='收益中心-收益请款记录'!C8" + "SerializeProperty": "='收益中心-收益请款记录'!B8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('收益中心-收益请款记录'!C8)" + "SerializeProperty": "=NOT('收益中心-收益请款记录'!B8)" } } ] @@ -389,34 +389,40 @@ "width": 60, "align": "center", "headerAlign": "center", + "colfixed": "false", + "resizable": false, + "hide": true, "key": "5fa9ac21-7b21-4c14-8cc5-c5f9da1e042e" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "请款日期", "label": "请款日期", - "formatStr": "yyyy年MM月dd日", - "width": 200, + "formatStr": "yyyy/MM/dd", + "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "left", "key": "0a669200-0ffa-4a26-b0dd-6066c56c244b" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "户名", "label": "户名", - "width": 150, + "width": 100, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "2af1996e-facc-4661-a276-413d94629c72" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "开户行", "label": "开户行", - "width": 150, "align": "left", "headerAlign": "center", + "colfixed": "false", + "showOverflowTooltip": true, "key": "8d8756af-393d-4af8-885c-694ed87cc412" }, { @@ -425,6 +431,7 @@ "label": "帐号", "align": "center", "headerAlign": "center", + "colfixed": "false", "showOverflowTooltip": true, "key": "60ae746c-5da5-4460-81a2-bc4e4a7c1366" }, @@ -436,6 +443,7 @@ "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "56f8465f-0168-4c28-84c8-b85c8c6e022b" }, { @@ -446,16 +454,18 @@ "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "5a6d3649-1599-4664-ac0c-4674587df276" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "备注", "label": "备注", - "width": 200, - "minWidth": 200, + "minWidth": 150, "align": "center", "headerAlign": "center", + "colfixed": "false", + "showOverflowTooltip": true, "key": "bcd75bc7-1398-4a5b-9266-3209b72048a4" }, { @@ -466,6 +476,7 @@ "minWidth": 100, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "db6e98b0-40f3-4b26-a84f-e23551ced546" } ], @@ -509,8 +520,10 @@ "operationColumnWidth": 100, "sumText": "合计", "size": "small", + "showIndexColumn": true, "border": false, - "stripe": false + "stripe": false, + "highlightCurrentRow": true } }, "5,1": { @@ -521,23 +534,14 @@ "pageSize": 15, "pagerCount": 7, "layout": [ + { + "layoutItem": "sizes" + }, { "layoutItem": "prev" }, - { - "layoutItem": "pager" - }, { "layoutItem": "next" - }, - { - "layoutItem": "jumper" - }, - { - "layoutItem": "->" - }, - { - "layoutItem": "total" } ], "pageSizes": [ @@ -558,11 +562,13 @@ "value": 100 } ], + "prevText": "上一页", + "nextText": "下一页", "small": true, "hideOnSinglePage": true } }, - "7,2": { + "7,1": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "收起", @@ -574,35 +580,17 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='收益中心-收益请款记录'!3:6" + "SerializeProperty": "='收益中心-收益请款记录'!4:7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('收益中心-收益请款记录'!C8)" + "SerializeProperty": "=NOT('收益中心-收益请款记录'!B8)" } } ] } ] } - }, - "7,6": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "收起", - "Size": 18, - "ImagePath": "收起2.svg", - "UseCellForeColor": true - } - }, - "7,7": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ToolTip": "收起", - "Size": 18, - "ImagePath": "下拉2.svg", - "UseCellForeColor": true - } } }, "StyleDatas": { @@ -632,13 +620,7 @@ "Foreground": 3, "Formatter": 6, "TextIndent": 10, - "HorizontalAlignment": 4 - }, - { - "FontFamily": 2, - "FontSize": 13.333333333333332, - "Formatter": 7, - "HorizontalAlignment": 5 + "HorizontalAlignment": 7 }, { "FontFamily": 2, @@ -649,6 +631,20 @@ "FontSize": 13.333333333333332, "Formatter": 8, "HorizontalAlignment": 5 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Foreground": 3, + "Formatter": 6, + "TextIndent": 10, + "HorizontalAlignment": 4 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Formatter": 9, + "HorizontalAlignment": 5 } ], "Types": { @@ -660,6 +656,7 @@ "Right", "Center", "[AUTO]General", + "Left", "0\"小时\"", " ¥#,##0.00_);[Red] ¥(#,##0.00)" ] @@ -736,29 +733,30 @@ "6,32": 2, "6,33": 2, "7,1": 4, - "7,2": 4, - "7,5": 5, - "7,6": 6, - "7,7": 6, - "7,8": 5, - "7,9": 5, - "7,10": 5, - "7,11": 6, - "7,12": 4, - "7,13": 4, - "7,14": 4, - "7,15": 4, - "7,16": 7, - "7,17": 7, - "7,18": 7, - "7,19": 7, - "7,20": 7, - "7,21": 7, - "7,22": 6, - "7,23": 4, - "7,24": 4, - "7,25": 4, - "7,26": 4, + "7,2": 5, + "7,3": 5, + "7,5": 6, + "7,6": 5, + "7,7": 5, + "7,8": 6, + "7,9": 6, + "7,10": 6, + "7,11": 5, + "7,12": 7, + "7,13": 7, + "7,14": 7, + "7,15": 7, + "7,16": 8, + "7,17": 8, + "7,18": 8, + "7,19": 8, + "7,20": 8, + "7,21": 8, + "7,22": 5, + "7,23": 7, + "7,24": 7, + "7,25": 7, + "7,26": 7, "7,27": 3, "7,28": 3, "7,29": 3, @@ -773,9 +771,9 @@ } }, "Spans": [ - "7,2,1,3", "5,1,1,33", - "3,1,1,34" + "3,1,1,34", + "7,1,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -808,8 +806,8 @@ "Fill": "Accent 1 0" }, "IsAutomaticFill": false, - "Location": "3,21", + "Location": "3,18", "Size": "3,18" } ] -}//XlS+N8xj9raHKRsz001gUAGpkFAr0XRAFcj3H6CS20C+eqTLIrMTVFNDC62TMgYo5o/j/I37PFMMsxDx4t7zcwkzM75cwAVC2glMACaOCImaEaR8AT9ssqu1rr2tp+OUNjAHgiZQmHuW7yvWECWZhZMrtJ44ARUEweREqBMHpaTmR0Id8oW7Kh4v2iR0kC07rAUJFqG7h6HN0yq0QAOsBPO6EBftkatpQdx/+f4q7vQmVU835PCUVxpnIg7wA5gryn1ZKfsC/JvY/RnLtTOMpE+h2sG447jJ+wE8cxljG1+6cuRq/DdzYrVVdQKXbNSOMsGGTgVrC1BD6Udkd7ywqgRvrjgVTDKAYUKB623BWLslBQ+dk9tKJ3NdMZNSewjLFVsFHK3n3OE3S80WARE9sOX6LGHtH4uDDb2BnTRgRcduzta1jv+8UisXpZYDZ6431yul32ZbrrZN6ENwWqk5rh5KTDnZ5jELatbpx/ihaofeBoGMkR52kbCPhPF7a6zNNJE+Lx2GUFF94aAVd2x7wYR4/hofDr7AJW2dcjIXThIa3tkooXtWuIAydqpbG2mPjlCOI2itRGqqvSrH9MEWEM2Us2uAd7+7PO13/7WwgnRJ7iucTDr3SGmQuKMkNGSJ7RBLun5TyvOqC31wwfFUmSZ2PHNPNyA0jkIF55oCSVGqxUwm8HI4gXKdoigrXLXf+3v0MKX+Elc0QBm7+zb1h27gFfMx6h20BkNmjH/efdZdMDmoHEu/qxCBQC+LLDaC6U13u25fGCOvEeFEjm8I48ksqvootnO/LGPa1LCq/77EIuJmAnImYB4cBByhO2/g/DlXD/x8TRlVWDAue3cZqKHPLaE48B7cnGTaIU0fG7X8Iz5rJ55/xeh6DXsUSkdclgmL2sE3ScROKCn7XnKgeA==|920 \ No newline at end of file +}//hgUS3R+je9z+mP7mjw8rpJLz6A8EES1lgqz+z91WuQ9R7xwFHDBglOxLpN7Wc1pP5REeEYV4T0fqgLOwAWidT6I5n+NN5Hxy7LC2csb9Dq5zuzGxvc7QX8OLqKPFhffX26IGgBqylY357AemElzuAMK+P6P2I528hvt77yCza4c2WhF+x1s/ZpD5cXOjEd0mNcbuBT4w+UAafliLyBRKoj2tPzA6+A9iUWtWLCoDtSHKUXKsNvGTwc5gZy6cCzBwWEQuQt2YEfAH6fkgrW4l0T7y8+z8j+AJQwesYjJ7Y5x0LROmrgctS13OQxUK1WaJCZwRrmKg0F5ddcuz1V6rls655EKkrNwV/Cd3DKKotSIdkay23P1QSA60Bz1xflRYNHZbDvpZe+8WAD9S3kByLo9yxApIKP/eBu5MvfwiPr4wVsDgRzYOAAJ3DaHb4ffMJPUUi1KAbeLF7RVyR832VHS6APKqM09TeAhNP2Oyw6qLsanoTUjPTM2CFr2W8+poxW0KTx4nHexEVccyceh3ke4ztbpo6BhlKvwWCMLJ+KkeK6/T876JONWoOJGtiIn64H2Zc2u3gbAGqq3UVzfHjnf7KHhjAHtFvbbOr2UyLmMp52eCUYGW/wi3TR+bIADKpyYxsNIr0Am+OIi+0DjObKj8QjDDz8nuzQEFdR63oCYZaT6cRpwGC9BnDOnLIoOCvI17Xs7us++c/Of01c96hCwIKBktgm10PnCKS+wIoLEQzQND6Iwj8CBT+bvM557GdSpWUXezUyG+DqVAV3m5bdFeB/eeqWgMBc0pfBdjWv3EGDCN2hLwH+ow6xbXv71tM+tkgo+DhCqTUgc0HQWnfGPTMSuJojgUHBKN5OaTdSMmJk/kING+uHyBnKpvov4t/MA/NlpOkTx0T8fEfKCyBA==|920 \ No newline at end of file diff --git a/Pages/收益/收益中心-收益请款记录.rd b/Pages/收益/收益中心-收益请款记录.rd index 68d6d771..6962a50c 100644 --- a/Pages/收益/收益中心-收益请款记录.rd +++ b/Pages/收益/收益中心-收益请款记录.rd @@ -3,6 +3,6 @@ "ColumnCount": 36, "RowCount": 8, "Formulas": { - "1,34": "IF(C8,H8,G8)" + "1,34": "IF(B8,下箭头,上箭头)" } } \ No newline at end of file diff --git a/Pages/收益/收益中心.json b/Pages/收益/收益中心.json index 6ae94add..6c4d7edd 100644 --- a/Pages/收益/收益中心.json +++ b/Pages/收益/收益中心.json @@ -49,16 +49,32 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } } }, - "Count": 11, + "InLogicalVisibleIndexes": [ + 11 + ], + "Count": 12, "DefaultSize": 32.0 }, "Cols": { "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 24.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "1": { @@ -106,16 +122,14 @@ "DesignLengthInPixel": 32.0 } }, - "17": { + "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } }, "19": { @@ -143,7 +157,7 @@ "DesignLengthInPixel": 32.0 } }, - "24": { + "31": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } @@ -183,14 +197,16 @@ "DesignLengthInPixel": 32.0 } }, - "39": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "40": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 24.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } } }, @@ -198,15 +214,15 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "%PageTitle%", - "1,36": "结算申请", - "3,1": "%CurrentUser.UserName%", - "5,1": "收益中心-收益请款记录", - "7,1": "收益中心-变动记录", - "9,1": "收益中心-收益明细" + "1,2": "%PageTitle%", + "1,35": "结算申请", + "3,2": "%CurrentUser.UserName%", + "5,2": "收益中心-收益请款记录", + "7,2": "收益中心-变动记录", + "9,2": "收益中心-收益明细" }, "AttachInfos": { - "1,36": { + "1,35": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -238,7 +254,7 @@ } ], "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面", - "ID": "611c39d3-2b03-4da5-b219-2823a9571fb9" + "ID": "92ef9383-802a-4206-aed0-3953e697d50f" } ] } @@ -253,29 +269,47 @@ "IconSize": 14.0 } }, - "3,1": { + "3,2": { "CellType": { "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", "UserControlPageName": "收益数据横幅" } }, - "5,1": { + "5,2": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "收益中心-收益请款记录" } }, - "7,1": { + "7,2": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "收益中心-变动记录" } }, - "9,1": { + "9,2": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "收益中心-收益明细" } + }, + "11,2": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "ToolTip": "收起", + "Size": 18, + "ImagePath": "收起2.svg", + "UseCellForeColor": true + } + }, + "11,3": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "ToolTip": "收起", + "Size": 18, + "ImagePath": "下拉2.svg", + "UseCellForeColor": true + } } }, "StyleDatas": { @@ -292,7 +326,11 @@ "FontFamily": 0 }, { - "Background": 2 + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "Foreground": 2 } ], "Types": { @@ -303,9 +341,9 @@ ] }, "CellStyles": { - "1,1": 0, - "1,36": 1, - "5,1": 2, + "1,2": 0, + "1,35": 1, + "1,39": 1, "5,2": 2, "5,3": 2, "5,4": 2, @@ -344,7 +382,6 @@ "5,37": 2, "5,38": 2, "5,39": 2, - "9,1": 2, "9,2": 2, "9,3": 2, "9,4": 2, @@ -382,22 +419,62 @@ "9,36": 2, "9,37": 2, "9,38": 2, - "9,39": 2 + "9,39": 2, + "10,2": 2, + "10,3": 2, + "10,4": 2, + "10,5": 2, + "10,6": 2, + "10,7": 2, + "10,8": 2, + "10,9": 2, + "10,10": 2, + "10,11": 2, + "10,12": 2, + "10,13": 2, + "10,14": 2, + "10,15": 2, + "10,16": 2, + "10,17": 2, + "10,18": 2, + "10,19": 2, + "10,20": 2, + "10,21": 2, + "10,22": 2, + "10,23": 2, + "10,24": 2, + "10,25": 2, + "10,26": 2, + "10,27": 2, + "10,28": 2, + "10,29": 2, + "10,30": 2, + "10,31": 2, + "10,32": 2, + "10,33": 2, + "10,34": 2, + "10,35": 2, + "10,36": 2, + "10,37": 2, + "10,38": 2, + "10,39": 2, + "11,2": 3, + "11,3": 3 }, - "RowStyles": { - "6": 3, - "8": 3 + "ColStyles": { + "0": 4, + "40": 4 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "3,1,1,39", - "7,1,1,39", - "9,1,1,39", - "5,1,1,39", - "1,36,1,4" + "3,2,1,37", + "7,2,1,37", + "9,2,1,37", + "5,2,1,37", + "1,35,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -429,5 +506,15 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - } -}//6ihvzcp+yS6If6P9+3zP9Y09OtvlIpBR7CrPpJ3UrCV5UneDDnHzrR9mDKVm+h4cr2LJHnu58g/CcKi3X/Z8DeK94qCZx613ZeoIZArqM+vuA9FamPxNmapA4SqJAWt5EJdw9zNArlbbEJ7umG5lbRa/hQbMKVJCmFU2eMmvtQaGFFkiK4+yRu+/2VLGDNB2P0C+eY1n7pgkawWM9t7ZEjhQHkRSB5JX4mcTpZ+p8/z/JKNXEt0TpHCCgadHMGa4nPUFj3M4Rm77nTZi0E1D08u7RzTof/9B1ialhw92bWa9gLEz86aOVCz8ClIMysR1yagLFaIFa7fsEQhw2gSGzSoIlBAHNOlShSDeklZONqmG8JXKu+db2L6PzMTSMipRB8UTQheJmUkDMJHyk0LUjygs17P4g2WG8u5ZBZ2/2CXlGtsNwAqsTQQWnBpFf6J1LBUFjN9tek1Tl4pIoTJeT5bFWsCpECWvKTLKtHqRzaCE1NktrYSrb+dQ030ibQqDZ2tkaktP+qddqZftmJ6JGTS798EpjImXNSy12Uano9avmvKHe+z5CDJYONYNur4e0fEpGNNtLjqhLFs0DhC+UkY5LGAA7EAAEPoRC3aolR96bTJ+3WhKZFDFwfkDmO0tRpFiFug3Rx5/nAsfbRSMrJTUeFXnDnJL8Hr20XNdfHBXB4akRs2m5c5FSMWEGRyVGhVouA+ho62GbTvZODnQhnPi6r8Q65HVYIhp3o/kYHK/xKiDlKEJCxEb9xMwiWV+c2ZP5vzvwtr+Th6ne5k7S5z+mHE6cERzvtPAOupv824uQjZqp7YckswX5s2xQu8HvMOBq1kHHJToc5GZRB4Ugt5Y+FOn+VpFKFRYu32MeWEzvu1pAsp2uTkiuIMzxHekIe/UaCawI9X97HbCOn1zYg==|920 \ No newline at end of file + }, + "CustomNames": [ + { + "Name": "上箭头", + "Formula": "收益中心!$C$12" + }, + { + "Name": "下箭头", + "Formula": "收益中心!$D$12" + } + ] +}//YTEzem7/nnKfwR8k+WgVYZicmpA/jVc9wTwj04eZo+QUrF0ZcDpJ+bB8LdSRA+/t6WK10EJX16TgjEION63eDSMemdMRDHTffZkE0BwWqceOv5FqQxGRJ7f64EFAVWLaw0/FH9Bydf+u001PLx/67T/wed5X7WVXXR5ei1omaZXBsWhXYYRs1xfW76+Mo7zIE5VdBxGhP+hLiLq5atWw2dt44JFnOyE2qy21iRIW+coG9F+MugXQjfQ1rerplzBMFf7V8Q575dr1/vS9Y4T8dMK9/E/KtUqnnM9fO7c0EjR3DaEg9fyBQODzy+XCfqCxrqCeME/0q2OvwilX/x/vW4IaSCzzWwSzDkLzsZbPPZMICMCZFeZ7yctwa7jtadl05qLNPPV8wA9EefKVXNiC8SVrnr73k6Id2rIGrCl3aUA4um60vVMPLLTrCdNi7LHjWkGDbFHP2i9N1kUUJfwnO4lGCYY7Jg6EmuQLvR/Hr8DxwQdcd+fQJ2jgN4zfAuysuQAPUi9Q6zUgO3fQ5uFPW9ilKlaDOccTZrFqekff75ADGcy2LvsFkWvS4EVKJDtHi5q8pUWKuj59T5Y/UEjO8cdKy2NrELAK7dnlhYo3qR1txekWuMKACs0oPuPf0t0Uf1X78f1GDmmkuR1Nmlr+dJhlgNIHXyWXgQMZjeoM1bDXDdlXK047Ut+3o750ZgDFn1ZFCnjpsGUH0IvLhN625os3mOCuHib4DU0/RpXR69ZTq8TL7DWh7AfGjY0z5CVo29QdltFHn6pZuQgw7dIIiVKYZLwznBS0TLNrILON2daxPRESIL4tD2RtnmUbn0PCfGs8FABkqwTn4HGyUAgCETYCB2+1baxz/rjl1NlriceGG2A6IdPGPf91fs2BekHgBc0ttU3Q6T3rjh3/VUsxaw==|920 \ No newline at end of file diff --git a/Pages/收益/收益中心.rd b/Pages/收益/收益中心.rd index dd55994b..ee7243fc 100644 --- a/Pages/收益/收益中心.rd +++ b/Pages/收益/收益中心.rd @@ -1,5 +1,15 @@ { "PageType": 0, "ColumnCount": 41, - "RowCount": 11 + "RowCount": 12, + "CustomNames": [ + { + "Name": "上箭头", + "Formula": "收益中心!$C$12" + }, + { + "Name": "下箭头", + "Formula": "收益中心!$D$12" + } + ] } \ No newline at end of file diff --git a/Pages/汇报/日报/日报首页.json b/Pages/汇报/日报/日报首页.json index 5ab2ce4a..de2d79bb 100644 --- a/Pages/汇报/日报/日报首页.json +++ b/Pages/汇报/日报/日报首页.json @@ -303,7 +303,7 @@ } } ], - "ID": "2e3a45ec-bfac-49a8-9e59-91c0c5d2f34f" + "ID": "0060d356-a833-44fb-a6b2-301d2855252e" } ] } @@ -433,7 +433,9 @@ "minWidth": 60, "align": "center", "headerAlign": "center", + "colfixed": "false", "resizable": false, + "hide": true, "key": "36118757-90ba-4299-8306-c836e9bfc880" }, { @@ -444,6 +446,7 @@ "formatStr": "yyyy年MM月dd日", "align": "center", "headerAlign": "center", + "colfixed": "false", "filter": true, "multipleFilter": true, "showOverflowTooltip": true, @@ -456,6 +459,7 @@ "label": "汇报人", "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "850a2074-4440-46c8-935f-a5a23e3344eb" } ], @@ -521,7 +525,7 @@ } } ], - "ID": "b2372f41-2315-4c42-88a5-5139008b78cc" + "ID": "5f2b0bc9-3132-49a3-8e74-1e3286bb1072" } ] } @@ -792,4 +796,4 @@ "Formula": "日报首页!$B$2" } ] -}///WxwcOtubdqZQ2FlGdhvcyE7Qxzn8XlOE0IzHfFXH7fzoDial9CR2DpZckDPr6QvAhILV09RXgBTCN1qBwJIEALVOMZjvUvoatp/vQYHaj5XNkBug+qd1qF5Nx0Ljt1+Jg+etNvZOs8ms/0swWQSevFOw8cEtQN3JQ+JmPNh093sbpqKPFk/12+AyaWO5SBrhFZB5gyNbcymRsPyPe4zrEA5g2e4CtvPKCQk8XK5KMuXyYDjbj/8bXrk1WhgqoyRWIepxjra1Ebv5eTGEewZTrTevfFIPGdBFY2wUIjnnc9XrY4F3NkeT9aXe2HtX7cIbULP+bY9hIJTxrNGiZTITM2RUKMMrbwG0SyLGagvfsfe6lIjmCAkAfDrXaI7DNeej34jmA5OmV6zdbwR+pPUJ+xVma7IuVsjiBYXDyF91AeSUHONNTSYUnSPUrBKknwsMu8mkpLTdL45/emuMWWTVKS0DMuEkP8HyI/GWnAz2i0iM/gA8lXIpjfdFFyWP6qSsdwNf/K/DN/DNc1gf4mN7OqHJRCMGLO320Zn3Zlxphf9z31EwupHHeYdTX9tchcU+8GnCcKMJcHfQvhzgERf5ETiCxT0OrfZ2eYZtHaK9yCZ3cS4N2bVgcu24rF5l+DIFt2DkRI0nJRzdjjgrX0Cq5FbinoBNSNjU6nr86fZyizGY1AGSgDnDhHBgaEuNL4RC7aajBl+eZdRWeGGG4oZIyf9qWrWI98miBKXQFSWHUPoAJQEhn2ohahjScuGYpppwIH2dO36tSrWtvGWxeTng9mliB00F6mdjrq5aPatjOpxBSWLlALqjs3hseeVJPp5MtK0s0kBsrH9oQ21+XDQrGp9e6geryNWO7TI13vD3vnzBOxBtMfLtKh98QVScNuSpzmVOIYmX0QdLoux6mk2+g==|920 \ No newline at end of file +}//1S2X93JNf0XP6LVW+WgYNF5Z4LicMW1ya51b271EOGcskj1omEZknqZ6vtgpdZiEo+JMCeFIQArltnVu/ejUM7bVWSrlnrPAZd/ZFPDzzFhr2F7ARPj4gBFc8jLnraivc6c1xTUskEo6dhvVTHN+H1CswPXNb/DR5YlvFodLkUaOp7FAdeKTBFaiVw2+H9OM8QmQHI4YrFaZJ1Mz1ykMIH0BYNtfQdIK0pwLmAGzVpi3BL0+Pv8CZ0niWARZnQg+JFP45ddy6rLcxYQ8eeZJkSlcbTOsBhXvStrYq/VXsqt8lyW+W9ZVW4Wgx0tJ9SBPYTKPQqWtehy7q703NJMN2dbPcQHpV4Kad9wiUbWRbNb+2je3R7HImD0/C4ASutkrQuAN6qiFEui0HMWN5yJCaKlb91FFnpaSO/D+AArbeBQKNTOrsi23lLmUOP2O9MtdqEaTxiwQAy2lCS1rD9m//1R/dqOScn1TZyRro/CWLZfb+DNgH8a4cPmKrT0+NVFugyp68VBr1NGkTxRRn15SqgNwNM6atBtfIj/cz9BX/9nyYTpR4giZmwEsCh0wmV/SH5smNR1hoDv22E2ZfXhD+/JwuHOLa71zba1WurvgSO2lR5iXFH43jnfI8IypH4nmcNm/8AM6CfzCfSv5kEFs1zw446vY8Z0q8J8C5GWWAqftZtB5x1ID2t3o2NHSlMKkQrfRxUGDaU1qjIa5lX233CjGnMVPaLvH6VYJCM1VnIiXxUb8sGIkf9t/dI4+131JQJMa1gaHXD2cnsFo8viawaMdSWymvL9too6WxFPv1rVqVztZnyTF5foCQB3E99NYL8GomkXgMb1L0u/rf7LHhlxV2oEsLa7ac45dKAcyHhjYWtOmtwntOK5OQh0O/3CYMvL+REgwEyAY97Qs75HQww==|920 \ No newline at end of file diff --git a/Pages/汇报/项目周报/项目周报详情.json b/Pages/汇报/项目周报/项目周报详情.json index dbcb8a15..089c331b 100644 --- a/Pages/汇报/项目周报/项目周报详情.json +++ b/Pages/汇报/项目周报/项目周报详情.json @@ -18,7 +18,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 35.0 } }, "5": { @@ -33,7 +33,7 @@ }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 35.0 } }, "8": { @@ -278,7 +278,6 @@ "placeholder": "请选择", "noDataText": "无数据", "filterable": true, - "filterInServer": true, "filterInServerOptions": { "defaultMaxOptionsCount": 10, "maxFilterResultCount": 10, @@ -468,7 +467,7 @@ } } ], - "ID": "3245f3dc-91db-4894-90d9-1e4d7d25b08f" + "ID": "ca7a4cff-f1ce-4bfc-901b-d9da1edb90ac" }, { "CommandList": [ @@ -483,7 +482,7 @@ "BtnText": "知道了" } ], - "ID": "83d91d47-1b24-414e-aa38-68feeb4cbc67" + "ID": "24d85358-6f56-4ef7-80a2-04343701e5a7" } ] }, @@ -497,7 +496,7 @@ "Title": "加载中" } ], - "ID": "0c8cbeea-aa99-447f-a8bc-419beca863e0" + "ID": "077e86d7-5305-4f38-9087-46e050975328" }, { "CommandList": [ @@ -507,7 +506,7 @@ "Message": "请选择日期和项目" } ], - "ID": "79eaf3e9-b75d-41f3-8c3a-9133d3d61d81" + "ID": "952b95ea-5f9a-449f-9fe9-fb6200ac59c2" } ] } @@ -529,7 +528,8 @@ "GUID": "c3c718bc-c5bb-4469-8c61-62ec732abe09" }, "CellType": { - "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor" + "$type": "Forguncy.MultilineTextBox, ServerDesignerCommon", + "TemplateKey": "多行输入框" } }, "15,1": { @@ -539,7 +539,8 @@ "GUID": "3157fe2f-4949-4b24-8e6e-33b7f8009bf4" }, "CellType": { - "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor" + "$type": "Forguncy.MultilineTextBox, ServerDesignerCommon", + "TemplateKey": "多行输入框" } }, "18,28": { @@ -599,7 +600,7 @@ "ReloadData": true } ], - "ID": "61d2f04d-6281-464a-891f-ffb9852923bf" + "ID": "b58a4a68-beb5-4839-bb80-1ee2224c61e5" }, { "CommandList": [ @@ -626,7 +627,7 @@ "Message": "保存成功" } ], - "ID": "b1cd88ff-e0a6-4c8a-84ba-5e433834e521" + "ID": "1f7861fd-a3a4-4387-96a2-71af5f35028d" } ] } @@ -648,6 +649,18 @@ { "FontFamily": 0 }, + { + "FontFamily": 0, + "Formatter": 1, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontSize": 13.333333333333332 + }, { "FontFamily": 0, "Formatter": 1 @@ -657,6 +670,13 @@ "FontSize": 13.333333333333332, "Formatter": 1 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 3, + "VerticalAlignment": 4, + "WordWrap": true + }, { "BorderBottom": 0 } @@ -665,20 +685,20 @@ "Strs": [ "Body", "[AUTO]General", + "Left", + "@", + "Top", "Background 2 0" ], "Borders": [ { - "Color": 2 + "Color": 5 } ] }, "CellStyles": { "1,0": 0, "1,1": 1, - "1,2": 0, - "1,3": 0, - "1,4": 0, "1,5": 0, "1,6": 0, "1,7": 0, @@ -739,13 +759,11 @@ "2,30": 0, "2,31": 0, "3,0": 0, - "3,1": 0, + "3,1": 2, "3,31": 0, + "7,1": 3, "9,0": 0, - "9,1": 1, - "9,2": 0, - "9,3": 0, - "9,4": 0, + "9,1": 4, "9,5": 0, "9,6": 0, "9,7": 0, @@ -767,7 +785,7 @@ "9,23": 0, "9,24": 0, "9,25": 0, - "9,28": 2, + "9,28": 5, "9,29": 0, "9,30": 0, "9,31": 0, @@ -804,7 +822,7 @@ "10,30": 0, "10,31": 0, "11,0": 0, - "11,1": 0, + "11,1": 6, "11,31": 0, "12,0": 0, "12,1": 0, @@ -839,10 +857,7 @@ "12,30": 0, "12,31": 0, "13,0": 0, - "13,1": 1, - "13,2": 0, - "13,3": 0, - "13,4": 0, + "13,1": 4, "13,5": 0, "13,6": 0, "13,7": 0, @@ -903,38 +918,38 @@ "14,30": 0, "14,31": 0, "15,0": 0, - "15,1": 0, + "15,1": 6, "15,31": 0, - "16,1": 3, - "16,2": 3, - "16,3": 3, - "16,4": 3, - "16,5": 3, - "16,6": 3, - "16,7": 3, - "16,8": 3, - "16,9": 3, - "16,10": 3, - "16,11": 3, - "16,12": 3, - "16,13": 3, - "16,14": 3, - "16,15": 3, - "16,16": 3, - "16,17": 3, - "16,18": 3, - "16,19": 3, - "16,20": 3, - "16,21": 3, - "16,22": 3, - "16,23": 3, - "16,24": 3, - "16,25": 3, - "16,26": 3, - "16,27": 3, - "16,28": 3, - "16,29": 3, - "16,30": 3 + "16,1": 7, + "16,2": 7, + "16,3": 7, + "16,4": 7, + "16,5": 7, + "16,6": 7, + "16,7": 7, + "16,8": 7, + "16,9": 7, + "16,10": 7, + "16,11": 7, + "16,12": 7, + "16,13": 7, + "16,14": 7, + "16,15": 7, + "16,16": 7, + "16,17": 7, + "16,18": 7, + "16,19": 7, + "16,20": 7, + "16,21": 7, + "16,22": 7, + "16,23": 7, + "16,24": 7, + "16,25": 7, + "16,26": 7, + "16,27": 7, + "16,28": 7, + "16,29": 7, + "16,30": 7 }, "SheetStyle": { "FontFamily": 0 @@ -945,6 +960,10 @@ "7,1,1,30", "18,28,1,3", "9,28,1,3", + "5,1,1,4", + "9,1,1,4", + "13,1,1,4", + "1,1,1,4", "11,1,1,30", "15,1,1,30" ], @@ -971,10 +990,54 @@ "PaperSize": {}, "Margin": {} }, + "BackgroundPictures": [ + { + "Name": "2ceb14c0-6604-41d8-b076-cf378a28ebbf.png", + "DisplayName": "背景图1", + "StyleInfo": { + "Fill": "Accent 1 0" + }, + "IsAutomaticFill": false, + "Location": "24,41", + "Size": "2,15" + }, + { + "Name": "5efa2e48-5473-4a73-9f4a-87447c12f142.png", + "DisplayName": "背景图2", + "StyleInfo": { + "Fill": "Accent 1 0" + }, + "IsAutomaticFill": false, + "Location": "24,149", + "Size": "2,15" + }, + { + "Name": "BackgroundPicture2", + "DisplayName": "背景图3", + "StyleInfo": { + "CornerRadius": 0.0, + "Fill": "Accent 1 0" + }, + "IsAutomaticFill": false, + "Location": "24,259", + "Size": "2,15" + }, + { + "Name": "BackgroundPicture3", + "DisplayName": "背景图4", + "StyleInfo": { + "CornerRadius": 0.0, + "Fill": "Accent 1 0" + }, + "IsAutomaticFill": false, + "Location": "24,572", + "Size": "2,15" + } + ], "CustomNames": [ { "Name": "项目ID", "Formula": "项目周报详情!$B$4" } ] -}//UNaYeIife+ebVzn8qIRyYyuHHqT57fDpDlOFAhETJIGbey9pT2h/FpV2812jdIHVvMWTcr88verRLkW84oOiqjnhAK/SPH6TGOVG+ZK/PaoxDwImgtqMEityinP+wjd5bjjIRbWolh93s0ed+NOL91Dts2G2S+GrpAgJrWyfoUaNk+RrHIU3I+FQeoZqkReZHPXO1k6AQhFHVE9mAQ1WCm5LnQmN+JwTXln2gsLI6U5Fm6q14aRmD4PQUscDCVC6/wSRxExAs3hOL20iijUOoLiepXFwTPY5QRYgDGNfBgHS1SDPkYmFXy9gQYaYE+kJ39QUcat31LvUYLjNwYIxUzJY/DKbYqVOfG3KO8bSsXKylMCCSZiWv13wa9m5d0JRY+gmcbEYfMvmzSOMucFO1pl1rw5HZj3GFu1U81csEX5p1beLZGbnfa4oRJ3bNk/ezT87e9O4kn409e3bm93U/mPEe6sta0zZZtCpDosL7j2n2TrGJfeR7+QH0QJSX0dQhhudQsJeAdVke5tiEinBAm2AU6Z7fozAjSd7hU8WLVLwnKG46+jLZDDZhbgkUNmh1R41d9wLIXIXsWxMc3J+CkJn1fuHe1iywTNiu29Oe5udGg2BIQcwC+oeAN2CV9RzHW4x/DIp+mvuph1cRgl1Tu2yS1x29NUwaEtmyi9dWWmSi0Cx3UQdLuyVgnEmhrHiftXWhjzo3c2zABUL72QRyMDvAn6w0o3MCYF3g2YHdlPe+q+tcc/XLPhEl50/+xIXleRCBIMijthnFkUacBSIW3WADYYngEXsohwbu3rswOmWTFbsOz7zOaslPUu+OPnXD3HVasf5jEKKC9UtMIaPUkspmOCVCioNotOTaXjy4XX2H/XJ3FEvcb6cKVA5OPRqMCDRY8L4V7JjT3csFmpuCg==|920 \ No newline at end of file +}//GeNEtIiffxKvcLWm3TiOLH6efiz6ChYhvQccW7uW5vv4wffdVDHxkdSCVQ7ImQSpKeW9t43gRNRoxxG03DnpNhK9awlgNrfaFdnGj80QVeL3jeZNsDyIpYYfHYESDGPAPBPJuOukZEyjw+noFH/qNMa9B35RmrcaIBR7+Wftwz0+tzDzAwSqaCXpXFa0zLC7DyyVd8Mkj9co0sAZbMBZqcHSuoZiwunRWxg30Ylmko+JsSXTvdCBolqX3qbYm+gUHgMbx9e0zLX2TsbDRrEAdEEB+6k6Gx9dUOUXEYeqrpYvXrKA5sjeDJB5zlSb+PMnAsXJitq0c9ht34AYpdNhvSaTx2joooi0jv6kDRhdMBczGlW3vOUM8SE56dyCdlYMU/J8qlfO4nNsneplBnJSVaS33+7j0SZ4q4WK0z6CpJwpC1fhQCDAh2wYHZvvd7s2Vd6ACCyUa5SUwYZM+EqhSboU1XID/55QD0nuYgx3w52IIz0GiQHtLZMhr90RL5rqzoVrEIrDiw8WDW2I0OGeQVN8hlFCJ6P9erd49G8Muu9lTMCcZ37SsPiySXfaPYS7apw9QwvbimAkaQHEA2uV7bEk8AsekY9btXL0DajuYABHlYH2zGkh8Rfux+M1gOZF4cyf0UyWojQLfWjqpqxrpYNYBo1C6W/EmzESyMTjjXFeBdBS6evPZYHUCWTFYGakxnkMg34sqDecLsKjKOPqQg/uKnUH92mFY0Tjdtc2kkaBYwlztf186IXnrkFZcn2nNi1f4zevWXCGRjw4ajU+YzbfwA9vHBZtJls7vBY2KyIuX0e4sZuD8g00VnbCwgUfzE4aaA49zFfvCJsRwPLjZHNtRDpPCTM/xZzV3blRKDqnhiicsaAw5sw2iM8uFHb20eK6VnZWbTYjO4Svx6TJeA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index 52e32caf..1d865751 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -252,7 +252,7 @@ "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" } ], - "ID": "3380f3fc-77a8-4c63-8cd1-5a05cf6736ab" + "ID": "c0528c2d-bae6-45e9-b7ee-7685202bda89" } ] } @@ -370,7 +370,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "bd7a4074-8f35-4c65-8692-ed9ce720975c" + "ID": "5b0746cc-2ced-42d2-b303-d02740a52c92" }, { "Condition": { @@ -393,7 +393,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "b076472b-9f85-4e0a-bfbd-3d23fb612525" + "ID": "d0890d7f-3027-4779-840a-f8d76d7c9bcd" }, { "Condition": { @@ -443,7 +443,7 @@ "Disabled": true } ], - "ID": "4ed70055-2490-4286-9a35-de48e3f7cd49" + "ID": "0758c0f1-ce0c-46a5-a1d3-f61b8e9c463a" }, { "Condition": { @@ -479,7 +479,7 @@ "Message": "操作完成" } ], - "ID": "d8ac2061-1ffa-48cf-bf93-dd387cf2d4ca" + "ID": "68f2cc1e-accd-433e-be14-8691641ba34a" }, { "Condition": { @@ -575,12 +575,12 @@ "IsOpenInNewTab": true } ], - "ID": "aebe6821-3fff-41dc-96a8-257fe05a6672" + "ID": "421b6730-89d7-4ea1-882b-952f2c58abd8" } ] } ], - "ID": "a887d29f-e132-4f73-8086-0ffd8b37d046" + "ID": "3b9cd8a8-89eb-4489-8bac-6a7046eff5bf" }, { "CommandList": [ @@ -590,12 +590,12 @@ "Message": "当前项目未开启收集需求功能，请开启后分享！" } ], - "ID": "cc704070-6785-4bf5-b97e-4b798c828778" + "ID": "4c4144e3-cc55-4f90-bace-f4eaa421a321" } ] } ], - "ID": "4c088b8d-3357-4c8f-9aa7-c702755be26d" + "ID": "80cb0277-4e44-42e9-a009-8328c8baba4e" }, { "Condition": { @@ -628,12 +628,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "fb50741a-03fc-4718-b08d-43db2136807e" + "ID": "5bd8e3f5-c8eb-4714-bfe1-23db6d56deb1" } ] } ], - "ID": "911497df-be3c-4143-8de6-735e5bc6e996" + "ID": "0e8fadb8-a0fd-4d34-8418-450618e0fcb8" } ] } @@ -707,7 +707,7 @@ ] } ], - "ID": "95dc42f6-1536-4ccb-beae-49071a71d8cc" + "ID": "d19d9658-6af2-4655-8808-35db5bcfe986" } ] } @@ -741,7 +741,7 @@ "Name": "负荷" }, { - "Value": "项目周报列表", + "Value": "项目周报首页", "Name": "周报" }, { @@ -946,4 +946,4 @@ "Formula": "项目标题!$F$3" } ] -}//3k17yFZdfeO737N2HmrdwxWx2toAARemxMTu6fCg1qV57yGPt2fo79LgKYPgFdZXHRjd4EHG5Tm1LkBEePoZvKRKBiK3RFRu1WmDaqAuCxFksbT624R+Js+Gm7DAts8fdpZQ4hKOZiE/sJikH9KOiPTN5DMDIUrnByNlPdNnqGM6hN4J43x4F/E6s900E/GEYJeE+J6GPOZyYq9GJrdpfpYsl+8kqWZ1faqoT2WzO1ACbDiZda5A0/jrgsN6YWVWA1DDqZ1X5/OXsqBdhBYjfwmNZDms8gMElKHKLKTXmHi0KZRS4u+OLCJWWBOOpvzkIh/fsIlZg0PjuagsLlyLaRt9o9nfSMkihs1nuMaa7WD99KIwR+q5+EiJCRphDAbjELw7zkTzhjvRIlzghkJz3jVzddZUKkKnyuMpi4DSzLz3Fi5tu3qI867sz1mjSKfJTb7kdOQQwb/9gkKenjwINIuSxfOIMuKA9k1ExsVqTfLcDikZKQyfpMC5uATq9t0ZO/A11qaqvslMS/kQ58j7hyPcnLdnUxTE5mrJOLadhzpLy8ghtJWtNWEdRDKm1MPxU/E+KfiZCLI1P/4sBcB2nAx3Pnao99hnXhbYgk/a/7b4II6wTNK30zyM6SqIIoPRniybXBzAGrO+bL3IqszTGbe+bmfWhkOeUh5IYTcPCCHbm1yZCKLDv+jnUj6l2Aq9RiHWRg6v+RHLlkpZI5OZS4NN6dYopIrpnRKJkUOjbtE7nEPMELEGCk1rlYGdTECo/qOkbhSeGuTKK+nh/5uZbJYzGM9MhY+/XjDyzfHih4/buu3q5P+qDxUzqbIzIdppDdSof+DCxcIIJprArwzOB6H38Q2W+LCcCH8TfBPePFlh0xvgvwOUZfMOYZVU0TF4Y9QBEKOYsiuGFpc80tS7wQ==|920 \ No newline at end of file +}//AYDKZImUMockSoycIuB8B1VMhNVPQloeTBzAja0WukR7NvB6zddolj36iik2feIMPw0XmqMG4GLwIKx8zDBhGGBNhZUhL0EI8Du29ZwUJ0qV4EUnCVKWffSvjokunJlWFH6tYwz4TayojYnWZEoQ+kDHhXmOa7I2yhBXroRn2V4LTxQWjE1TcKPH8hBbMhAPRD5m8AEs3nWYa8BeJJwd770DhdGN3vT0cVUv+MgH4HOkMRf1hmVPwHsZ6mV4fhr1QyFEankaaGpUk8JrWtu28uK3FU1WqDQ4oDJcRtUknpGkfFSXaIYPTYOwNvSbpHUHdrhwo+EzyhFlJ+wOSFT6D4XBmjvQwRmxENoRXL55AiqM8eoXeiEKvBHgoKRsndnH/EwedpHcBwZsiuri48C9JXxJTC/ctRxokrskKRcZtz9sbdrYht6nMjieaIRyob7WfFvjuC8SvmZQl3UfewIAji/1M3PajKg9WZzQpYC0MlmOuRT6UQHnOsE0H17LsrQ4ebBQtR8WBNnIMwtDeyPvbrIaoZnNAP55BFlq8/Ln4DWmso7Nn4d3P0EkS5Nwe0a94HHHg7WVxsN/RT+eUHF7fZsgjfgVTQOoaxtUQsTSQk5JeaDytFw5fP3BOs+Kdi2tK2wK1e9PhFT/388BUq5nyyLUKfEpU95968k1NuvAexNfAzC/vq6c6VUiIhe97byAHhaa0AcmLeaCWEwSj4E90MgvD+gttj0Ho6tl0aAt2JUi5aAdejYutAplZEB2bEoz1KVcL5P98KkQgMxXgvk+EYrqYWBpTXb/4G/3AO7Fp9ezDLJKVwRaygrj/VorIqoUDtbTXsAu83vq2/d3b8hAS+ZF8akc02WikbyJFsTo8dJYBqgvR9HoX5RyE9bXkd5DUot4/Q1ZYH6bJrDXOq+3QQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json index 2ef211d2..4804cd85 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json @@ -46,7 +46,8 @@ }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, @@ -861,7 +862,91 @@ }, "CustomColumns": [] }, - "columns": [], + "autoGenerateColumnsByDataSource": false, + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "ID", + "label": "ID", + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "resizable": false, + "hide": true, + "key": "6fc09867-1d97-4a0c-9734-0cf0f885d9fc" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "任务名称", + "label": "任务名称", + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "3485b7ca-27a5-4c2d-808e-f09fd59fc171" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "反馈类型", + "sortable": true, + "label": "反馈类型", + "width": 120, + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "f7cdd87d-92a1-431c-a81b-53d15fd9ca65" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "功能", + "label": "功能", + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "9f1456b4-ee8e-4d42-a846-d702bbb1ead9" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "提交人", + "label": "提交人", + "width": 150, + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "ba76d95f-d958-4c3b-a546-f297806c7c73" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "处理人", + "label": "处理人", + "width": 150, + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "ccb117cb-c757-4e3e-b891-52780819141f" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "处理用时", + "sortable": true, + "label": "处理用时", + "width": 150, + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "dc989dc1-d92b-4aa5-a4af-3cbbf2269337" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "状态", + "sortable": true, + "label": "状态", + "width": 150, + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "7056af4a-50f9-4ae3-848e-f7a0c542d29c" + } + ], "showActionButtons": true, "actionButtons": [ { @@ -1095,4 +1180,4 @@ "PaperSize": {}, "Margin": {} } -}//n3poBCywGaXyhZnMbIQBE9lE9HUQ/o4XuUV+16SsK+9780I3LKkpvRtqOZbh9wqJiAOoEohZytLwzUQ6+nlYqL/NFS0Yl44wLdV+DG8QvfLtczHcxg8ND2WoQHc41ygU/hTDX+FZcK04zyqo7nfngQS9XxSlA3bAKsHPjjtBbkZcokHWtDI/whYB+AuyoZIStIlDya6wd6VGDMrksFNtvAuDtZIeMNar2ddW5fSfqaoZklA4QkKnJbhahAZD1m6QEkX0Wyt2tQX2bK9R3gHEDNLNpg/5RkERtfjV1q9e9taPRkibN20cZHTVI3hQ4a3r3tICVaSl6M9xFPm/6VwQutSU4/PoDlIkeWPVmXstqmJKorX4OKwA/RNa4YLxSwz2h/T1a3nP6bhR1r2SF6qNeEHC+AVjz2i6QXyM2i4txwGRVS9fjoK2ASsPk2zWxIpdzqLa5/M5Hki4PjUEMYlc3oLctDQl+nfZ/FVT2RDyNO+KGXpkHBlQNQXgt1QldzkgHRbu2MJmBiffzH8UbrFkUREKqB3SjA5u83f+B7T5amsH93ZwIsBppXN8j+KP+w2k2cpbaazOL77+ed+AGCpRtiy5Uf37w1b0Fa5eDjlx+iqu1mT8mP4c6R0aUBruS4Vvz2FLCsU065fgdZKrkf3S61Z1JigI4H8E4ZN0lWWyBRDSloTWhV1oT+66OrtTD5kxRnVK1v3l6yMItk7SC0lPYaMkghH47CSrexOru9L2GTKTj/+C4N/9EfijMN2Dv4UFdTywIlWx+f1ztb+xZhrjuCsuUIj3Og+9nxI4vEgss3Df78RcDoRvbWGyO5FjMACerUC9Ykhlez5viLDJjWYvu0uqr9A7p+uIGH/cEoB5bULbyojhCOHbLLPW778HFWtA8vJFAMI5n5f70v5tIwxa/g==|920 \ No newline at end of file +}//670Tepciov4c3C+x6m7+1RtMRZWdfYSmjKLbgCDFfQzGzVm2O0IumMZrEORHD2sB1o5sO8gTYAf6VDD5OiMGYQSlvdnJvq83tj0RjmRMrxo478+lX3F8jpgBzj0yzjNeX4LeuF25WeocyqwHTymrVu9N+yk8ZFwa0/5NAZO0tH6gFcXfnebt70ApzYtld8wC6wT+6t5eyddRbP9ifCsEriWCfb8EfRPpRIBBWzG6JxBQNyps3/xgpZinJS0Fh8NW9LvRl1JZ6hGqgid8/1ZmDUTV3m2PMlDWk1dAs5VObYXJQihKjKlcdGIM2g+ARZi06OoZZX1+CLVpwScaZ2DfXb5wQMl8ZTmCKlkR3EL1EuQTs+M7P0FfbTdae3qtv4CHcuSo7FoPf7/ZdNlLO2adxoGK7Qoe1SEJVYUqvn9hC//RYylr1UNJyC7GICSZtSoPtBwlpzlXeiAEQfKROvAzw7Iji7hhhgYLfQqXe/WnutF2Fgg7aJp9XS0CLGPUf/5yQt0Wrj+ykcnIZo+Jklp3kBhIhsUH5A9I3+GAAVsEW0hdC4Xwbnb/ZRqvrDTilvTqwtGzhc9OiTKjTVuNQ5ZhMn09rO+lZFvi93O15ojNy+6xiDEXBe3BTDa2j+BfiCDf5kmoB7wqMzPHtt8Kn4fBV3dqRW9D93x51Y+0K7f6te07Y2nk3Lft5N98V7BUPmKhEPf0P3OarJfcC7GpimDwgTgpkJ/eeYgbxy23fBCWAkJlKiYJCRvWY28ta+wTsbFnxckV4hb++8fkmeZPqjgqn5/m6fWmPe9yDXspJh6aIqNdZWvWDmdpREvabj4yQThzWJTLHT+C2lwHvsL8Vntwox0dlJpFoaT+bJNDXlRZoT/t8c1t9Cc70sBR1YA9Bsr4Jw8fM3NXuLS9atApeqzgcQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目周报列表.json b/Pages/项目/项目首页/项目首页-容器页面/项目周报列表.json index 706ef65b..d1c114e2 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目周报列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目周报列表.json @@ -436,7 +436,7 @@ } } ], - "ID": "2730d479-afb8-4da8-9535-3c29ef1aff04" + "ID": "579cdd1c-5ebc-4993-8a0e-fac75128333e" } ] } @@ -624,6 +624,9 @@ "minWidth": 80, "align": "center", "headerAlign": "center", + "colfixed": "false", + "resizable": false, + "hide": true, "key": "ef444f18-2d5e-48db-9906-1f77cadc5761" }, { @@ -631,8 +634,10 @@ "dataColumnName": "汇报日期", "label": "汇报日期", "formatStr": "yyyy年MM月dd日", + "width": 150, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "aa0739c9-a90c-4092-b336-c390e359c039" }, { @@ -644,6 +649,7 @@ "minWidth": 80, "align": "center", "headerAlign": "center", + "colfixed": "false", "key": "ff693e3e-a472-453d-9114-242e86b94f0f" }, { @@ -652,6 +658,7 @@ "label": "项目名称", "align": "left", "headerAlign": "left", + "colfixed": "false", "key": "f6365fad-5d2a-485d-b807-d9c7acde91ee" }, { @@ -660,6 +667,7 @@ "label": "上周工作", "align": "left", "headerAlign": "left", + "colfixed": "false", "showOverflowTooltip": true, "key": "963b2f47-2e36-46af-b59e-dac1e672efcd" }, @@ -669,6 +677,7 @@ "label": "本周计划", "align": "left", "headerAlign": "left", + "colfixed": "false", "showOverflowTooltip": true, "key": "2daf6d13-9fe5-4a22-9fd7-37f72c39371d" } @@ -842,7 +851,7 @@ } } ], - "ID": "952cf6b2-86a4-41b5-9eb3-87649028655b" + "ID": "04fb6654-2058-45e2-8fb2-eb482cebdf98" } ] } @@ -1162,4 +1171,4 @@ "Formula": "项目周报列表!$F$14" } ] -}//K6+vqXhUZhnBdnTQSK35TS/MHpoCXWYmDJOKvIscU37qBgYJ6YxDHBZqI0UP6RYuPXLYBztTZLxibQoblPOOruvTeL7vRRi9A13355iy99KD7rkqOV2uIuCV+IOnVkzv0nElWIy6P0+jBgtijMaO+ifG3NmZroM618QclsgdTMhb7jl2i2IZCPhxqpRaASb+8Zw0t0ED/WBcBJ6EJx4hzNK4MBJn371YxyX5dE9Y46peA5CIg+FzdcAMDEltVXM0XvzDIoRgV0Y7KhnT1ELelyEz/FMkvX6ycKJdS3PSxz0hgZOjOdf0qA2SU7BUDSnSWSyuUoIN1he7JtmdBW1aVPfnRPH1Pw12pnmHMKD4WJJcm0DJen8zGilBciW8IS2CjquJL0WCH3TJtU2e07xMdLSs01davJYHR0RceUzvH6ClyJ2MVlwUwTtlypDtsYLnSnEr3nAnMz6fX8FFbGFGLffXOH2rNxjmXip8WfYGGVA12ba8Jl4XrK8Qa941SaF5C6srC3Fy8LuItFlW9M0uzglvKts6lx8Dx9b9KFlgMWZ2LmBzuSdSpt+Nai9uxB1czQpvfU3O5QROo73QCXQxKE98Cbb1f/w/N8VvjpfClhIJN+HtC9OAaFaDtPwN2wlH/fVWL99E72zJuHXzf0HxkCVj9BU+n0ke+/EtMfPwcMtSo/Xfr1Wm4vfOmBYGHVA5PFnzaJwPhvX0Ukh4cU9qPxe3HHWMyb6N1bz3/KXxjfO4d9cKb0VhKSW6gwmxi7dmMBY5AbYA1ZNmSdem8cUBB6C8toEn4RbLVs81YahOEifft0x6VaJB4knKQ+3lRUoRVUh8SmxJuyWWRVhlB4BgSQB+DV2a+FrYyN/AbOvruGUid+IiAK/Xpp8LVKlo7Tsv5mV0Z70TefYphT4031UYDQ==|920 \ No newline at end of file +}//AG3BDcg8HxNamB5Kf5csSQVlth2cHckdt8RaKxJIwHQIqvkap06QEjE4XUHScQIjsRh9osQasaFAAsjsqhDaW7sply5yfIRC/84hgMnwJmcec3ciY7Ft785MIZK/AN9V48oA1+QahfrkSlLbMdMedf4aNQrfdbsjZURHg8uytKfqDLFbL9eXFzLB9ANAUiXyOZfa0FRQIgsMRYVIh80J6d76YD6ebsMKmpca7Pezo4Aj2KQEfZJernopG3hkv1W8F1dcwD7NFANPTEgRZNjMdHtRlmWdC+OPf/ZDlk36XE9MzxakHWzc5NugbYYJ9xobZYJCujPmkqPAUeVhGbw0ddco1wRKyjj3bvjgqqkugbb+yHvNCzek+9FmGlI94ualUzxxfailcVAYa5QmX/VhjANHS7mvXX10nHPjxmtPKkoMJkiqP9oXXHuJgxnmv/gOADfiD0w9KK/n4HjSNZUBBSbH+xa4/IPe91Enuz0t06F9LVJY+vpasKTWAHfLfqn5na/jq3u6YSw+c9bkfaTbtkODtpGSScWoYw403NZnM90Tpj8QF9aH007wtYTyCS0jMrMeZM1LzQZGba5dMj2ld1j22IL2ZAKRpKKNJkDy1FKP7Z8+0IWG0S6CEvWkqFz98/y1f/DzkVtSgLtpldN8GFZ9c6eyMxNa0qFWR7UMmJ+f2EB2Gnp45v+22V7IrB4lhHcwBpAH78xZm5Fw1F1g67xboMcK/csN431zaRvC0tozWDrBqSVmakfRMeawzd8m2eGHLGioW9d8GkbfQHKhGrTJz4xnrbI8uEuNUn2WUEdLfqrfHuGURqjtJNcWfqPFP+tjwNmsTaaEDnTVKBpdYeZgSRHDDcWovLrs88MVK5QNt5Enmomvoll/pM7VlvJ4//v7aTX3iWNjdxbFXPJEOA==|920 \ No newline at end of file diff --git a/Pages/汇报/项目周报/项目周报首页.json b/Pages/项目/项目首页/项目首页-容器页面/项目周报首页.json similarity index 90% rename from Pages/汇报/项目周报/项目周报首页.json rename to Pages/项目/项目首页/项目首页-容器页面/项目周报首页.json index 55795cb3..6a75ae18 100644 --- a/Pages/汇报/项目周报/项目周报首页.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目周报首页.json @@ -460,6 +460,18 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目周报首页!F6" } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目周报", + "ColumnName": "项目ID", + "GUID": "962b8ea8-8ff5-414a-8933-a3d8d6b1485b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(项目周报首页!项目ID,\"\")" + } } ] }, @@ -618,6 +630,15 @@ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", "FunctionName": "remove", "Title": "加载中" + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目周报首页!项目子页面" + }, + "Title": "加载中" } ], "PermissionData": { @@ -641,4 +662,4 @@ "PaperSize": {}, "Margin": {} } -}//3l7sOqWWh0j2qpoQhUoOkq9/aLc5EfLsQq0ffyAJb1pPGxc0HuvqTnJseRZy9biuIALzfCNW8pGAfAShNG4bicIbdmjrgCcXs9hoM4pLpmb6zmohUlH0Id+QxLRl3/u3RXd98+2xpgIYSS9ijfjbcseMrcJfBaULf9m2xvlXH0xNOapxPkLdvy9DbtR/9hUvN7bMDrZiDwBkjhP9LcjKj8azJC97T+BC5WRmkZxkUh+zpBGU6J3yN8QNv85jdCOM4ecIHpsHSvpeyH+RS7BOE/KPdT4aZZLuTo8gU4oMLOZ1nXJyWBypLhaWsEApL7h//ec75c7G9lrjCG6xRaUxbIfOmY+VpLoxKLEmTldQxsqzAjQis5lOpEa0ulUkOerE4eLwL/RnJFQzVgFEUvkmTwtjqwbZND5xe+5h+FJCHEXZP8DiDNDy5QmMoowzdJ4BCd86GUBC6qQpJQ1utyVSVxjjK+cG+HfKVjx8KlpwmGAZw7dc+xuwEb7rra6G+CH1zRs6YfLsIvRsBN6brJYkGh5eiI/a67soK3/3gk2pHO8oyOqJ+0MkIXn9ZtPQ+2w6fX5IaNh1oAZbY9aAnzc8FyReclsrMK5gazqZOILLDPaoHSOVtE3XMT/xgaYY9ZeS+cRdPbjjahrN+taXRMZnXGCXjqM9bxNGRIrk1BVS2MKSQqdzxVzKtBQzyVUPAe7JN6WhlUQ1oa/m6xw1alZFdvpoVnMOSTW+s88u5AX34Mj2vuipCZhyTuffcypRyQFKaFp+RN8fLfaRIcyGb6UHy8Xk0fz12YBaJBGVOtA/LwlBPwDE6GST3q1poYnzbaOy6MaVdve4BQR/4KFOg8IzDxLgEsVvB7ZoyI58l0SccvIVM8KjMBhLu3baUnkP+sEIQySeqfS7YgsRyBjWq/kMUw==|920 \ No newline at end of file +}//JWytFhjLEmEBUDNlFT18HLF3fvLMS5SgxjO0TA7SgUxc3ZLS4r3euxmxgoHsAEZt1t9UzmboPsAeRjNHZphU3BNGLIvu6P6N1Usp2i6h1pB9V2j22FDf+LrJBqD8dO0YuW4sDBEWx8O4P5DMVnwwWRT8S57GQVRv4V7iikOfkhaUhFeE8Wk28ZCZVu7qh0f7ZNnVjoVYVsrNymFBfzYezmm2tXV24NH0LNI/a1sUOB7+zEVlKjwaPqhez0H3dtBO9LCTt2Zq0UgZRLBDM4J2xEFMuWNpYd5QpjTI1NIVIfJuvAOjAPuKsjNCANKpjWMug62KwmtYnXPoKBIx5KH6w7avUk0J6PcAfnpAoTamXfGeBwDsFWsG6b38GX95zp6qFM/fSnmq2niKIL3aGFpDWnIYAYcnCkEsQYqXtUWwdL9Z3B7AnVp/6zFcS5b4tNO1qoGh+drCN6E1GcY8GbbIvZaUunvh2gm7HekFvbwi6Kv9nutTMLBU7Vr7Fu6Hk5N+dEUO9RkkFxnK/PtyVrcoPNu05LfKcnox6TQ25rR9nYFSjMn5InhxHupaR2ak7a732ZIAEQLItBNPUKzA0d8c4iEevaFHG+/1/fWK2KWeG1xh7i48xideEMNv1K2PbFA/9jr//uH6Xn5W6pOe9ZIMPzcG2yZUl8WJAgxyBDU6XfTAr/EhEkb9kZWcqeVvz+6NIZXsyeH0AsBE7L+KBTlI1kUypkvsS0nk9d4nCZk4hXQNLo/qS2bVYdtkKjMvL9rBOxb3nrUck+ECYBS779z83FpnUAZW7BBxGaAkixLM3qIy3ocIi+H+ak8YwFvzKJJeOpn0Kyz9ePeWJodGkk9dxR18qQL0PxcfCJxPSPyiTnh+xjIQFggXgHAbQD7/8ulGo1OuUpE4ctDMwW8kZNE5XQ==|920 \ No newline at end of file diff --git a/Pages/汇报/项目周报/项目周报首页.rd b/Pages/项目/项目首页/项目首页-容器页面/项目周报首页.rd similarity index 100% rename from Pages/汇报/项目周报/项目周报首页.rd rename to Pages/项目/项目首页/项目首页-容器页面/项目周报首页.rd diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json index d0256a96..acd11450 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目版本管理.json @@ -476,12 +476,15 @@ "align": "center", "headerAlign": "center", "colfixed": "false", + "resizable": false, + "hide": true, "key": "a148615e-ca29-4cf4-bb95-5caaaee6d824" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "类型", "label": "类型", + "width": 150, "align": "center", "headerAlign": "center", "colfixed": "false", @@ -503,6 +506,7 @@ "align": "left", "headerAlign": "left", "colfixed": "false", + "showOverflowTooltip": true, "key": "ab936e9c-8188-4a37-bb95-28d4fa053e5d" } ], @@ -567,7 +571,7 @@ } } ], - "ID": "d007c309-1b54-49d9-a984-475481fb3d6f" + "ID": "7e8a571b-d7d2-48b4-8428-bc947c5b6ccb" } ] } @@ -656,7 +660,7 @@ } } ], - "ID": "480cbadb-c917-46a1-a008-97cf2d60f024" + "ID": "b8cfc5c2-3359-4624-a732-0200efd52175" } ] } @@ -793,4 +797,4 @@ "Formula": "项目版本管理!$B$6" } ] -}//as2fbgisF6674CLevlFpy+yQaTyN8ceNwb7rMEh6LnymeAoZJjPZEbowXoomjrzIMWNupJEBMpQ3+4K6EAhL/ogpBuWOoG/NsZfoJFKovgFAOC9K9Pw4IIw6kNflhq82xfQAAnIURLmk/FaY2r9kA9Z0e2hZ97wU+coyUDgq2N8pVveBkVOcoZcan/b481B6RmsGhee1WRnS7Zk9aKeNX8DfxVe/jfxpjHAVcDQEHOpYKEMcTZLZIqckHWyJP85W/lQ2japKjmiJcGUhqpLCxs52zSph16aBchaDHq03CgDAkJcxjihA0t5SIELZfSlfzMfBPg/+XvLzTAxotuzfJxaMZ+nsGXGnJv753/1lvTu29g1RPIRK4l+DjASc8W1lb90tnhj6MlaTrjKRyfkaDbH7XaKnvtpuGkGAA/dRy5O45c0wizB+UuHaYpXQiFPmlB6XjGzEx7XyNiCOKcngYpLoPXSeqwh3FwOmSBsBDVgmYY/19QHLhthuIWJ5OmQz/warD1YGprp0yleQVcWCFK612D44w9j0owKG4Gj85WeukDxWYbtqy2qClV+18px59dO/IuZIPTSfGKtjaeiBxYB/JFaIEonfYAfMCygcc69jbCVtn65sKZvDZGHyr5+Ra084hWSSGRdMLk2yD9RHju9aTfwLpfMtGDurBY5SC0hUnv1QcYhNwrOhPrFPNXMMLqu2hKTbQn19WbMcJ87wU0qnjNXhKyevjtTBR24P1iCzUrCJyrOVRfsLsFjESj0VNNjs0qwVVSrhjnlMSDcYAKoxuQ6iCdi/AXNR+i014jM0vONnAix3kuzN90ceDkz/gkfcKFmDOcID3a2S1XV2rg4JtjhrCmP7e1sfDy2QLcHyBndxl+DQOrxrX+KFF4LV59JerQAkUPz24aYezzJwAA==|920 \ No newline at end of file +}//Y4iFXEZ2CTNZO8IZ/hcPnmYn3T6+DZ8RjBS/qAOBUMlRZwoJKzAmmxBcOOlYiyNnOkWyRWVWOqdc0QNfO/N9linDGDScRcWa0jdZLlGwC9Il9vooccHgltF8BMLhoIUz0mZB29KWYQZRxJ1rDA6ZkyN8gbPWU11eUKHxcnzO/ifakSE0gxPZVZxaCAYEAadr+zjzfi28EbjFVEZAh5M9B3QjUs1mmNVK4K0gAxj1MJqzkLWxKBqydj67SQZL7BBsFwfUXB9csYXVGwp9MLC0BexHwG4a9WP5IfZYgssvaovgUN0U63UkQHDlK+C4iWaH4g0k8f0DzlDuGiYYir6VZXGuFgYuYldijg7EzB6oDVOlRbacLnzHDywkhaY/ovl8SyPrVdJUAt1pTISdCMY43/iFoOor15R5k5wyeuMUVKQDfa4CqL+fpXvAVCVKUj9B0RMwA6zXC5CAjZ53Z8d6v/Qmgm8cT1XaKZ+vGsKw4+HVaik+FdJ2cZvQ6M8le+utzusZZu62s4jnnksN+ZXCIVMr5JNnjGcQz3HqJywQYLJq4uFbv61OlPz0/2g6khUxJmDdGu27ieyA4Y3/K8MafKluyN1aHLmH8+/Ko6Gk1OQh5vrQ6l48gi14JbdpuuHnE6+OFjaKAuUKP6kFmjl4KuacTbIAF4gGsACnbi8eEug0GHhPNo7XiTVA3CzxczFhBVQxT0lSImYbXJGymPni30UieRN4XmyYhD3qp2AzI0Mu4AF/HBjc0eK6rfVdMpgevNtSSVdAqvFfm645tynQfBra9UP/dfWOep6oxzoXNelSLO2tYiQktK7B/WQ/jOrVQkLuA7eMf/YGKcR5OYUFNaD+Ey9O5HGr1WSML+YkVLdpHfUBzuo4CVWFGsoPVWMSs2y7fRCNUFy1GhD9fhqgCw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/预算申请/项目预算申请历史.json b/Pages/项目/项目首页/预算申请/项目预算申请历史.json index 535106ab..0c610cbe 100644 --- a/Pages/项目/项目首页/预算申请/项目预算申请历史.json +++ b/Pages/项目/项目首页/预算申请/项目预算申请历史.json @@ -33,7 +33,8 @@ }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, @@ -354,7 +355,111 @@ }, "CustomColumns": [] }, - "columns": [], + "autoGenerateColumnsByDataSource": false, + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "ID", + "label": "ID", + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "resizable": false, + "hide": true, + "key": "958ee3a5-6be5-4680-8673-773c44aeca23" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "申请人", + "label": "申请人", + "width": 150, + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "9f157271-9b2a-42b2-bda4-b50da3f13b6b" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "增加工时", + "label": "增加工时", + "width": 150, + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "541b8a2f-1a7e-45be-97cd-2f54401a6edc" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "增加后工时", + "label": "增加后工时", + "width": 150, + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "666e0e13-911a-4c61-86d5-2a0280db8678" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "增加费用", + "label": "增加费用", + "width": 150, + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "ab7813aa-d7ad-457f-bdb4-ae705706791b" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "增加后费用", + "label": "增加后费用", + "width": 150, + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "5764a55f-1595-4c50-84ab-53c11279daae" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "申请理由", + "label": "申请理由", + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "showOverflowTooltip": true, + "key": "36d884a2-e948-4a97-b7ba-ef43b433ba9b" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "描述", + "label": "描述", + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "showOverflowTooltip": true, + "key": "e5c98e1b-fb9e-4e0a-b761-03f1fc5eaae3" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "状态", + "label": "状态", + "width": 150, + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "key": "59848657-1ed4-4bb3-bd63-28c6dc887e7b" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "流程实例ID", + "label": "流程实例ID", + "align": "left", + "headerAlign": "center", + "colfixed": "false", + "resizable": false, + "hide": true, + "key": "c00f0c71-c666-41bf-9ad2-65c943ac61a2" + } + ], "showActionButtons": true, "actionButtons": [ { @@ -524,4 +629,4 @@ "Formula": "项目预算申请历史!$B$8" } ] -}//48kQUrI9TWrHuuwejLL7xjdkD3XB2ssvtHJYEL/xYQ8SBQtoIAra7JJu2hqfBhgBQssvRFvzIW3s+haExcdozJXi1Z6l33L2BWVNNopDQCOKMhHCgRDxl8pbO+7zvXLGrm640RGilv0fIIYHoF+VJJtIjjX0LlBE5UmaWrSCUxvkj4PlmwQGscGtu7afTytvNjuUq8AFKg1p0Ag2r1vvghvoltIwG/Fo3KhkZQD8cX2+DwDFrUMhG4CVUsGqIDcQjuUgaXZSZQNvL5J4Me/Z9OPTjTwIvbv3FtPJ1UrzUHVs+VvHj7SBWfFO54KE24ZgpBNxyQt9qH2AziKQcToLNMEeOGV5tY7Enji/QvtL97RkSmBk6Fot1MZmOoBOYJQRExqf6yOHxCklJ8Kg/PGdodoFI7WGKoomq8N/oP/oSUfzASBqJ2Ca9Lv5XK2EC9FRa9YwjqsZV85nOs84TuaHWYKwv6eaTJwjGm2NpAXuBGe7CIqiQhsrzekxdKHYkkOMqT7N4ZsYZ6K7BMDp1JxMetkjv25ZnD1XZpAvfT8oIEm50PPbVREy4FSpeTRqfdWXkkkYzy4VVUaJ6Vhn803mCsBpDwzqEAvB+JbNZIB5b9fvTt2YuC0G2AkJHenseWi3oQaa8o6d526YvYwgHxuXkweRM4TCb3JloanGZQBI3PcSLC4I99xSU4mIZprRdyeOBJu8A/Vx2NxSDq8OUeN0m9QQfVx+DBDgSqAkxdJyzNFqrKzW07RbapK4NQgno1AnCx6rrAjQmoeTkzsRfpg/15BipRc8ZtyEyHnEKUbAiYUuzh25iPzlvkWaFnK24k3fT2VxEmrpntZ/9/41xwtDr+EJ8yufYj3gWgPT2NI4uZe2KbX83rc586GKm8uLDHVtBfg6A49pdr/GeZv8mt4Eaw==|920 \ No newline at end of file +}//AAvZEZe/Kcv4/yiSSAfAVgN4Dp9mq4dw5qx67J17NyP4C2/faEmwDYjEkUu03AUDFMu3g5vVaTvcUxfrhEk6vRHkQPPA6+85i/FlQT5wKZVa4QwcTpDFqHN3nRVVRMbMRLkBDJ8Vl9E2lAmMmYkua48ekMrwr26kpBFgApAt+FqLWAc0b+kr+ATPOlt0eGp9DafN47Xy4GN/S8kYS7DTXiz3Y2tNLdxjLA70lrfwofW0Iw3A82/T7BkQ3AxgDDhk3frQTgio4QjOKanLNftnTX1vWfpiUI1K/t06RHmDsDaiYT+NPLU5sS7BqdpmJN16IVGOHj++6nUcI2fdPB2MGY0PBhWsynS0KuwRKoDLvDm4QuH93IDFS2/UlOXmO6+QFTFuPNPdQy3IaZrT6kU0XstJNuuf/5yyd/lLlg/+Pe+UvWa0GdQNnZgQIQyHYTecjMVs3mpCc+49E7wRvfKC2/zElGZLe6Vp63PblUOrxvKU6cSPycV6/aeJP7SlVTGzm0szoH2UDZyZ+oJiAsevkRiuiaexFGA+Z32TRx9mVzjsN7+gtX0QkWx9EaazrimEUudD2RjlG6xbL1mx9F0VP5ukmSU4z9eAtSici8K1deNJ+Swz2dTRhACusvr2E3Yew6SsedxYIe7NVVMEg9oXM08eiyKOgdvpY2zlM74duZXWILl1zJ+A88HBOsGGftbWG81MaJwffECTz3kzZhPxD5ODKx6iLzKo13afU8pNXqklL0YZoPMyyrS71+iwaATK6TpOaVYzTdMiWSVY3r31nCTryzmvxeOcKYji4gNVEZY235GOtYxGkXTbq1rIB2cP4l63zoF8dq3Y1cfi0fgRTGQRd6EwIV1svVOomwg0OCqoFd6Ab7An9LD7vtcpzSBqSik7M2JgGCVeFFR2EWIK4Q==|920 \ No newline at end of file diff --git a/Process/反馈处理流程.bpmn b/Process/反馈处理流程.bpmn index 12083827..0e88bd08 100644 --- a/Process/反馈处理流程.bpmn +++ b/Process/反馈处理流程.bpmn @@ -4,7 +4,7 @@ 处理用户提交的需求反馈 - + @@ -14,7 +14,7 @@ - + Flow_1919cz7 _8c854f9d-40d8-4aed-acb1-6778e09b2e08 @@ -35,7 +35,7 @@ - + _8c854f9d-40d8-4aed-acb1-6778e09b2e08 Flow_0e920z7 @@ -55,7 +55,7 @@ - + Flow_0e920z7 Flow_13qnftb @@ -72,45 +72,45 @@ - - + + - - - - - - + + - - + + + + + + - - - - - + - + - - - - - - - - - + - + + + + + + + + + + + + + \ No newline at end of file diff --git a/ServerCommands/用户/更新用户配置.json b/ServerCommands/用户/更新用户配置.json index 1d662fd4..0788877e 100644 --- a/ServerCommands/用户/更新用户配置.json +++ b/ServerCommands/用户/更新用户配置.json @@ -27,6 +27,10 @@ "IgnoreBlank": false } }, + { + "Name": "姓名", + "DataValidationInfo": {} + }, { "Name": "负荷", "DataValidationInfo": {} @@ -34,6 +38,10 @@ { "Name": "默认时薪", "DataValidationInfo": {} + }, + { + "Name": "邮箱", + "DataValidationInfo": {} } ] } @@ -43,48 +51,6 @@ "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", "TryCommandPart": { "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "用户", - "TableValue": { - "TableName": "用户信息视图", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "f91b3ff7-676b-48d5-8e93-509dd2ee55bf", - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "邮件", - "GUID": "62e678a5-f9ee-410d-bd98-e5a95556d6ed" - }, - "ColumnName": "邮件" - }, - { - "GUID": "29f3ad1c-6b92-47a3-8c7d-882c9f8ac91c", - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "2226f68b-3c3c-4d6c-a5eb-aac00b02c951" - }, - "ColumnName": "全名" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "e7c9e67f-4354-448f-a5b8-0df81d27d6be" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=用户名" - } - }, - "TopCount": "1" - }, - "ID": "4d7d73e4d30f4a8eb1017158c0e2adac" - }, { "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", "OperationType": "202", @@ -96,11 +62,11 @@ }, "FullName": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=用户.全名" + "SerializeProperty": "=姓名" }, "Email": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=用户.邮件" + "SerializeProperty": "=邮箱" }, "ExtendedProperties": [ { diff --git a/UserControlPages/收益数据横幅.json b/UserControlPages/收益数据横幅.json index 71e4ee31..c4fd66ac 100644 --- a/UserControlPages/收益数据横幅.json +++ b/UserControlPages/收益数据横幅.json @@ -457,6 +457,67 @@ "CommandDefinitions": [], "MethodDefinitions": [], "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "查询数据", + "TableValue": { + "TableName": "成员收益分类汇总视图", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "cb72cece-7dd9-4b90-b0f9-68f3c287f9a2", + "BindingInfo": { + "TableName": "成员收益分类汇总视图", + "ColumnName": "总金额", + "GUID": "76a03426-dc20-468b-b119-1da4144e620b" + }, + "ColumnName": "总金额" + }, + { + "GUID": "938a1ad2-d1c4-4bac-9ad4-017efb70c531", + "BindingInfo": { + "TableName": "成员收益分类汇总视图", + "ColumnName": "待结算", + "GUID": "5ebe643f-b33f-47f3-87b0-6e4f8cdca203" + }, + "ColumnName": "待结算" + }, + { + "GUID": "f37dfbec-4d96-4d1b-86b9-1e519e193e1c", + "BindingInfo": { + "TableName": "成员收益分类汇总视图", + "ColumnName": "办理中", + "GUID": "8c633d3a-453a-42b2-9a64-65503bea7ee7" + }, + "ColumnName": "办理中" + }, + { + "GUID": "fcf49e6d-b13e-44ad-a8f8-39fc4981eaa4", + "BindingInfo": { + "TableName": "成员收益分类汇总视图", + "ColumnName": "已结算", + "GUID": "feafc736-503c-419a-b18f-f5e4d7354b09" + }, + "ColumnName": "已结算" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "成员收益分类汇总视图", + "ColumnName": "成员", + "GUID": "5ec74a63-add5-4f1c-822d-7174f9a99ddc" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=收益数据横幅!C5" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "0b0434f2eb114c0bab7fcc933aa0db81" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -467,7 +528,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=收益数据横幅!C5" + "SerializeProperty": "=收益数据横幅!查询数据" } ] }, @@ -475,67 +536,6 @@ "compareType": 1 }, "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "查询数据", - "TableValue": { - "TableName": "成员收益分类汇总视图", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "08ae786a-4a91-4cf5-b11e-17933aad417c", - "BindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "总金额", - "GUID": "76a03426-dc20-468b-b119-1da4144e620b" - }, - "ColumnName": "总金额" - }, - { - "GUID": "2cdb8749-f4d5-4ad8-a943-ab2169fdcccd", - "BindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "待结算", - "GUID": "5ebe643f-b33f-47f3-87b0-6e4f8cdca203" - }, - "ColumnName": "待结算" - }, - { - "GUID": "ee889364-3f0e-42b9-857c-025be9640c58", - "BindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "办理中", - "GUID": "8c633d3a-453a-42b2-9a64-65503bea7ee7" - }, - "ColumnName": "办理中" - }, - { - "GUID": "3f302ca2-28eb-4406-8a21-f6da63fa56a5", - "BindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "已结算", - "GUID": "feafc736-503c-419a-b18f-f5e4d7354b09" - }, - "ColumnName": "已结算" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "成员", - "GUID": "5ec74a63-add5-4f1c-822d-7174f9a99ddc" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!C5" - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "a87f85d936ab4423956791f8d16b6dca" - }, { "$type": "Forguncy.Model.SetUserControlPagePropertyValueCommand, ServerDesignerCommon", "UserControlProperties": [ @@ -570,7 +570,7 @@ ] } ], - "ID": "2d04ad39-14b9-4342-83d7-e3fdffc7d799" + "ID": "7441f14f-0104-4f73-97f1-b9245b461a09" }, { "CommandList": [ @@ -596,7 +596,7 @@ ] } ], - "ID": "d48f91c6-2b56-4852-9e86-feb03c55dee5" + "ID": "e220df66-3af2-4be4-8dd5-c7be4a37bfc3" } ] } @@ -624,4 +624,4 @@ "Size": "908,112" } ] -}//DOm/wQ1tsM4sI+o/OVl7VPwP1i7k3mID5xYG0xUUoqFDhElX/IYln89VBBFBrAiyRzLqEGR5i/IQvUbVBWuTVYxhKYyh01+57n0TGyBiQ19nMq2Qjh3yUsgxmoWqdCPGul5C0J3fcbxN6Z0yRWs9XnYAciW6I9WG6mm0awH8KsRl2OE2CV+CvOaA1lqmXW9M7roGjW41TgB4PugwwtKBhSDZIsWtuF8fkCZ9TUT2xsfUzZDxX73DTWVid68UhdNjFOv44B3/KkbEVbVv9HyVISW183jSRedjJ/2VvjmK4axHPsErGFsoijfIHj13EXuwUPl05qUHRdpzy3hNg/nvJecj7GtQ/q0DOC3hA3Dnf2t9GEqOpGWI2rOi+XpYYhN62bMLOm3oQ2LbnWzAJPju6bu3ZXNmfYXdixzcJVqC0eEtkPRrByygs3z8OO25foPje95JL0MzYZYYKXgjxnTo+qRx7huItyAqJi45U5gPRYG3iJVlG034TwPy+2RtRZaOV0DQ9t2GqJBkT3dw32IeWCWvg1O06QJENTrULdEkxg+89rizSM0yUiv+Okh+vpI7ESVRQD8OPaPBG8xfiWs9y/yR5OzV+ZA2vQXz4MgSzT7ZvO+HaaZOqxOuhxt5XA95GYNHwSS99cfzhCGuYuQl0XdIl1FkabngDt0G4i8KzINhDNqEs+MWbxROeuuDLQQAbkG/tEVsn9RrTDYkX9i6iX7aD7pakBGfNy0qle1QB2PjBakJBBQaLDOjB3ObziQb3PJ9+1ztn2ULp6c57umyqMuaw5WBKsfZK0t9Q96xatsCdfaPzYxyA4+OtxkieBOLMQW8Hacgi27PAFc356bnvNFKjm+SgluZOFss6aemLTlWU8GfaOf3R45jOh5dxGbyf/IMbxUknb6yK9dbp5I6Ig==|920 \ No newline at end of file +}//7SS+tsYq2t5w3Ic4s5FX5B+/phVA06pA2VCeOVekZbAaE8dmO/ga2RLSwE+TGagwuNA3R2FUxQl+bLTi6lYg7vzgRdFKSCfuF39xKQydNW7RlMsMD87LWEd1pIMcusVVw93NDutu5XsZt3eLD6vcNDByCMQ5t1yzAgoCETj8eI5N9+43ck4s6lFDHUqSU+v2ApmVqyKJbxP87sxaOHtj1+rY2g/7/b31gLuM0NVDbBWFOhW1YyK04BwdVbPaq+gV3ZnK0hycSyNcZrpXB5d5usQnmhKZExg7QODz7ZqY0FCAoDrYFjShjqzImzPjzRWK5uJlB4uvK6/ilDYF3ibhGpQzTL3TcEErwfWU8qHxI3hDkRNwo4S7N1O+mozcxZKv6I6hhliG1PvIZdDtxx2NVbQXzpcyRaVDd9KEYGlL/GKacF0PItVErJgMWDdLy+M8CdW7jYgALRwGg3/5l+sSCufjylMBWYubOS/98EFU3xGNESxwNBjRWUQ4SpH35bKUGqWAv5/2rJYrXX8EzkLTeGkSSQYi7pgLvrortz3+06Mfo5eVPu+/aUraLPemJMMB2572ciIP3cJG7lQ1NSAHMEaE+9rh6Ils2KKdgRBrhd8l2oeVsNNCNdVy2wT1n9RKuPfyOrokQBZsEVsxt1N7h7jgBFHyKmrXVTB9EB1d225kgMWxBVOcdyaN1sMqYuQxdrhu3hc0CaN/HPNt240RnRZm2sNKf5M9UpjtOJ56mL/NlR7yGmoPxc51V3RPwwRH8N4g884Gn0ynZfE66s/3OqYia9c0NhmX9qGzP4PWe0ESd1bx04N9d7oQGoik8Ig/UX0xK6uBXMTDuzqkQ0AdKP5UIrBL+nN4pbZna5wz3YgfPs9dwnS/73fe2F+2J6ySuRnk49Nk4PUNh+wnvpVUSA==|920 \ No newline at end of file