From ce161ae081bbaf4f5c35a215c15ece3b59ae1cef Mon Sep 17 00:00:00 2001 From: cuckooent Date: Fri, 22 Nov 2024 15:58:52 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BF=AE=E6=94=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F","MessageType":2,?= =?UTF-8?q?"Modules":[{"State":1,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BB=98=E6=AC=BE=E5=87=AD=E8=AF=81=E7=AE=A1=E7=90=86"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86"},{"State":1,"Type":1,"Name":"PCPage/=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BC=9A=E8=AE=AE=E7=AE=A1=E7=90=86"},{"State":3,"Type":31,"?= =?UTF-8?q?Name":"UserControlPage/=E9=87=8D=E7=BD=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8C=89=E9=92=AE"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 74 +- Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json | 16 +- Pages/b90932e038f94707b54e571ff7cd84d.json | 14 +- Pages/f5fc8d78af50450e9ecd5e29f22c67b.json | 26 +- Pages/任务/任务管理.json | 613 ++++++----- Pages/任务/任务管理.rd | 8 +- Pages/会议/会议管理.json | 742 ++++++++++---- Pages/会议/会议管理.rd | 12 +- Pages/客户/客户管理.json | 560 +++++----- Pages/客户/客户管理.rd | 4 +- Pages/财务/付款凭证管理.json | 845 +++++++-------- Pages/财务/付款凭证管理.rd | 10 +- Pages/项目/项目列表.json | 1078 ++++++++++---------- Pages/项目/项目列表.rd | 10 +- UserControlPages/重置查询按钮.json | 131 +++ UserControlPages/重置查询按钮.rd | 5 + 16 files changed, 2339 insertions(+), 1809 deletions(-) create mode 100644 UserControlPages/重置查询按钮.json create mode 100644 UserControlPages/重置查询按钮.rd diff --git a/.collaboration b/.collaboration index 18da0610..51bb8cec 100644 --- a/.collaboration +++ b/.collaboration @@ -738,21 +738,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T15:55:38.8611608+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目列表.json", - "Pages\\项目\\项目列表.rd", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目分组详情", @@ -960,17 +946,7 @@ }, { "ModuleName": "PCPage/付款凭证管理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T15:51:50.7025501+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\财务\\付款凭证管理.json", - "Pages\\财务\\付款凭证管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/付款凭证详情", @@ -1226,19 +1202,7 @@ }, { "ModuleName": "PCPage/任务管理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T15:50:28.1318872+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务管理.json", - "Pages\\任务\\任务管理.rd", - "Pages\\f5fc8d78af50450e9ecd5e29f22c67b.json", - "Pages\\f5fc8d78af50450e9ecd5e29f22c67b.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务管理_列头", @@ -1294,17 +1258,7 @@ }, { "ModuleName": "PCPage/客户管理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T15:49:02.8676046+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\客户\\客户管理.json", - "Pages\\客户\\客户管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/客户部门管理", @@ -2640,19 +2594,7 @@ }, { "ModuleName": "PCPage/会议管理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T15:35:39.696035+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\会议\\会议管理.json", - "Pages\\会议\\会议管理.rd", - "Pages\\502ee1db03c84e88a5a54340cf07e2c.json", - "Pages\\502ee1db03c84e88a5a54340cf07e2c.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Table/ClientInfo", @@ -2740,12 +2682,6 @@ }, { "ModuleName": "UserControlPage/重置查询按钮", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T15:45:40.381284+08:00", "ModuleType": 31 } ] \ No newline at end of file diff --git a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json index acfe6cf0..c0710380 100644 --- a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json +++ b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json @@ -159,7 +159,7 @@ "BreakpointIdentity": "e05f184a-4975-4f9b-9f39-446a132b820e" } ], - "ID": "66380129-ec6e-476f-8eb1-ef2162c767d9" + "ID": "452b7cc7-c48b-43e6-86c2-8ac992b35764" } ], "BreakpointIdentity": "7f11b776-4c2b-4a50-a799-6fa332623c08" @@ -237,7 +237,7 @@ "BreakpointIdentity": "ba369856-984a-48d7-aebe-1805061a9a30" } ], - "ID": "c519d6b4-83f9-4975-982a-87f1e9e328f4" + "ID": "cf18c4e7-3807-4073-9c40-355de8e9b4e6" }, { "Condition": { @@ -269,7 +269,7 @@ "BreakpointIdentity": "e60dff53-be6c-4166-8cc1-9d01b4044ec0" } ], - "ID": "9a34e47b-4084-474e-89ee-9fb21ec6c640" + "ID": "5f1a2df4-1201-4784-923a-efaf683c26a2" }, { "Condition": { @@ -350,7 +350,7 @@ "BreakpointIdentity": "f2051fd0-57e8-46b8-bc9f-9ca50becca99" } ], - "ID": "f0562b2d-8e29-403a-9b88-a1906ad3a11f" + "ID": "f2f81f8e-9814-404f-95bd-d1bfa866a0d7" }, { "CommandList": [ @@ -366,19 +366,19 @@ "BreakpointIdentity": "a60d80b0-9a43-4a7c-a985-6a35940644f7" } ], - "ID": "d08c530c-81b0-4cf8-b160-8efe08b5c501" + "ID": "18ed54aa-28e8-4fe4-ade3-9aa17237aa5b" } ], "BreakpointIdentity": "8a9e009a-888c-402c-b8d0-160f8727131d" } ], - "ID": "93a52883-8842-4c0f-9202-2cbde6c4a78a" + "ID": "e66ae403-0afc-4dc0-9bf7-7634ddbe82af" } ], "BreakpointIdentity": "43191ceb-2366-44ad-b62e-68bc45f1a5c6" } ], - "ID": "4ca60800-d77e-4472-a633-7b2da2c555d6" + "ID": "13ad4dde-3f51-45e8-8c17-ab76a1f38cdf" } ], "BreakpointIdentity": "6d4e3fba-f49f-47d4-8c12-97cef1e39ce0" @@ -452,4 +452,4 @@ "PaperSize": {}, "Margin": {} } -}///riv4ktQrjiyB3QztWVWv8S95pMZIUWB+J/ioApyAUVSIETqIAAJYHCNsTFvELAQeXmv8I9qiRp3s3WuIDLmHJSmivV0TT8Ibu2nMQu3wQf66E5yIy+n+lao2u23R2yGd8pR3SKU82pjP7LdTBTsq96erkmmXXjX1UTjWmt9Qide9LQiTlhwc6mNf78up7t0EO4DFOWLDYliKN3c4Z9hi2Nx2DVs0GnwsXzMsxhvnhO5s0lk2KbZ9B09aI8LCXJcbYK5VIManyOYHMMo1yzi97hTDo73RDyq8gxwcJa3rpuiEJEXKlSZdYw7q7Xefz13FQUqLGp+YjntSO504R7jLbRWfsHlTDBIUfIUSmA4HzriE2HpwRN9xoGfQmhiJtmK2giwPEbKbCUYPhGdyUzpGzzYUvTifogAxehnr+lG9lAOq9Mv0rSK5pFZIuCAXnEuMIvpX7vFUJ4M/VFaQ/ZZg6vetA1KzO934UEWin2tFGwHs9Fz/f7HvuU1ySgSrWXETdCGOFihnn63IjIiiz13wke4OtbEHsnw1OcvkRIolEYiy/+hVF95fPukYo9ydcPei2aKR5OoUI25qbSZWgmHW5pkRkmy13iqLpcQ0Fokdhf/tPk0LwZSEOVoJXYnBY+Tg+Qow8I84Vn348YzegN80CZKfjnTMYABItnsQ9qVxfzsidccVJa2odyQAJdHJtJaMVElWVlzmsmIvvp6KQvu4Q0M/0VN3iXOELa7ouR6rx9kdYVVQyaVgE2LtqlWjyhPH9Lg3MivLszSJ9Vll3wahbNPIOSs9+quV7vmJZZ2hH8F7ppZLbjL3p7kKJJoT5xzJLBznUOR8V3HXsxtvPFiaqZlwq7KEsTKo+9t5bR2ammLU0IF4gwhSulLwzJXxWD9/DsT6msyiXwgtsW0LKm6VA==|920 \ No newline at end of file +}//lAmAib8l+kIewWuw5jH+ThFa9iG8BA3MWkA1eqAprGM6xYtaeT2saibb2tG+98e2WvjNKfOzCTJrWb5EeFIKMiPmv70sn/5jnal+E/PKV3u7vFSoIGhJ2fOAVEvk9zKsI6Ks//AJ4NSp9nZybKmHDdNavZMfBNmquaHvREha9T7gcunHwORuIPRWdVnBguGjZjQCJJTuMUc2WAsIH4E/mEYdfZc1VELqeCVLtLzIA1GBchIiH2571klXBIMAy3tdP4KJEHS+zY5JOZsd64eWwtxOlBgUtTyr+Z9XQvASIx5fQjgTH583qsGH4MkD5hhUAGv5aba6sGTcs6611lNVDlR74t72Uo05fD86HnAM9W+1eBENo3mUXePDllLqOpNDMaYO9HBYOJoUrp3S5lDMvvyy9/YJ0+sOQTjHBk+ugtoHN+Rurh8OCeei2hmStazc+rYZ7o5e5+4etlBrhZccsj0PeO2Cemax6fg+F+N9u4PzDV22D22cZSYimjU0CNAOCbZS48X4WjlqQwI/xazsap9gR7GfygjjO52c3jGkmEnnxl4ubM9fpNi3QVJCb9weaNPwBBbbIBcZpJyOJ3fh6Yyz6CmzYO23VCdZaNu1HRXHz+S0qX9kS3cgevPVpfU8iSqaWVW1ree1nRGKaCevNAEq4ed0XziGvjKgyKImpGtXe6wZilY/+xgJbJ8n2itySv1k6Vs1oL3OTO/8xbCc/Jx8Eqd9sXwexC1Sspysa1UES2GlCuzmDJkaxAPWXOPrdAf003WVi+pVIW3rNGRyphSNtKqg7LmTLyGEMueHeQVUM7fxL0KLmChpbY56NPNKDqVGaFc6ekhsGNv+KHPrmMK0Ya0DkNxJnXVzbx5k1YN7am86521+n3q2RQQEnjWY+rGuycEvmKFn+rQ2Lec+BQ==|920 \ No newline at end of file diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.json b/Pages/b90932e038f94707b54e571ff7cd84d.json index 0db04d41..83eea673 100644 --- a/Pages/b90932e038f94707b54e571ff7cd84d.json +++ b/Pages/b90932e038f94707b54e571ff7cd84d.json @@ -263,7 +263,7 @@ "BreakpointIdentity": "08c1bd52-678a-4899-8594-f97eca56d853" } ], - "ID": "a82fbbbd-efda-442d-9e8e-b2c23627096a" + "ID": "ac795caf-529a-4eb7-8a02-1670c125cc03" }, { "Condition": { @@ -369,13 +369,13 @@ "BreakpointIdentity": "3a992ee5-d493-426e-8317-f263d273f9a4" } ], - "ID": "66e28b9f-e24e-48c9-b805-0f6092d84d4b" + "ID": "36ccfa33-eff6-403e-99f8-73b81ae7793d" } ], "BreakpointIdentity": "a9e22740-9a11-43ea-b57e-f6460ddd6b2a" } ], - "ID": "b014b4f1-6709-482d-bd2d-1b8393f87a61" + "ID": "f1a01147-36c5-4721-a167-9af068642abf" }, { "CommandList": [ @@ -386,19 +386,19 @@ "BreakpointIdentity": "a0d2026f-44e7-418d-bb64-96477b475916" } ], - "ID": "e20cf5d9-fd54-4908-88a9-71bb8df83304" + "ID": "84ad4d33-9eb1-4e86-bd00-15b18fb1b4ab" } ], "BreakpointIdentity": "a88da50d-e90c-45d6-979d-d40440bfd3fd" } ], - "ID": "ba361c1d-951b-4f96-9faa-e7c9c26e2d66" + "ID": "a5ef92c1-fa5c-42be-b729-387fca225d94" } ], "BreakpointIdentity": "aab78852-8a78-4aaf-9af3-e35063c2901f" } ], - "ID": "c6c0580a-77c6-470f-8fc6-29a8cdb53d3a" + "ID": "6b90469b-412c-42d4-b28c-c74abbdde945" } ], "BreakpointIdentity": "380f6ed3-83db-4468-8d36-699c0a094c97" @@ -665,4 +665,4 @@ "PaperSize": {}, "Margin": {} } -}//vso/Tt4JaPBZNTB11Q81NbLTOldnAY3uim462zQP8K5Nfw8cm/A7YVcH0Pa/NV2SArKJCzo9pcwoiFLhCguPRRtm7/oJ7YmwGr2gCUPI6pNtBg9CsyPnIbTmDY6C8KHsZS0Z/P4LkBPj6gPLSoNdLxa4W9buzWiyu6qhgefCrcXq21aGw64lI45kBNUJJakuVNZr3hqY8B5TpJ32WMkZALS4abG0WB5ptSQMMHPBHCG1dLtIjKYG0emIO/xasLV165F3bPnoloFPYasIssggGpfeugU/kmXO95wmqh+905j0xjfeWPhuHFoWiKt3YkPjvi7GAizEKWNipEXpeKlFLpR6TIykP8G1qJfxlkPYPEhXQCifOeywKXdT1DLT0ddgzqAoo/RfihR59OaXAJeWtxjctx93qmAxvhFI9O8+JyA+nLWgQNhUs7OWVZ7NJ0E6PWWyODnSmYOfAr0l1vfHhTl5TynwWFmtHU1NBk7731zQts1GKnZQkUviZRrv/HhtsMkUucvFIZYDahoUkW4bL2cxOVGqDjTXYk5THk9UwprN8Zjrjh+GAkU3oP0gGxK97gSHyw2oiG07xEzvYSk1CWFz64YoTCqazAhVtNmgwFz3l5hHbxxXwdDcBJibKMNr79FT7I382KQUcfPKCBt0bXyG7WDwC5jIZ3vPUOfWNOsZCdFy9QqECzghbDS5vuKE3zAGkcgsD+2O6KPymNYdMxmCmFyynIUjScfluMMOR4vpymuCO69WTdm8fRdxEVEGq2lJMYa4UGPQ99H/zcDW40B+aAiA4bzXMmDxcJoDR/iqbaSAtck3oHlbzQmASIysnq31NsrVhY67x6MA+4k8LZM586XJ5ja4DH6gwOhm5bniSJh001tMUITCacZWQRBDDGBqkUsqoZhHeMia6YdQHQ==|920 \ No newline at end of file +}//DOkdKe995JO0hptAirYzGUvKpCNVamcZBv4y7Ew1Z1/cmdglrDnxhkTZXUngiR8r6sEOjySDSHUjm3M16XKRX4eQPSc8I214xy7BMIK0nQzO/F2SfIaj9/2P+KHrT3SzSHkbZiaUioRlePfW3eE7mUNa6Wtdjic8GZzMn1vyPBbWa4HRnKy5ZzvJiWwCqb3MCKdhSoRjv7PavAQxP22W3ol3nL/vKXHHgqohtxwApS5EPVLzIH6Vg69LUbRK2FvmPghVCH07sqJOS2+McjFLF3GVXvsYZUm0WigkFFUJR1ReAQAV/U3qxy4kcP0HabZd48KQ50NyLt+Xf+HkqyiF+kwiybnC7SfpIHTbi1r5DWrN7cHXo+vJonWe6HYFVnxiJoTra6h3WtJV0j2NOSjXmIlUvfNvM+gmrkeuVCAGhLMHwXo1Zv4sz8yvCi5pih3l3TeT8w+vrHSFjjifGSeNbLGst4zT4a55Mc3NxmN613LukHFosVl9bzXHMj76htLIhhrQd6RIE38aDiNuwUxhjUdSWQx+Q7kZBpRy52a66HKrsxgeI6Y50AK4WJEj9e5rcaVw0r6p14B1egRDxUBxapH66U9Q+i+4N8vcYi2F6hOXtqJO8CNTCZnHCLxxsXgb/VvJ0bQ81/XvXCAL/H6ug7NkzSGNTQPLuK0V3zgbXY8AnfenoPRbmhags1QwHat6nVvjEIK7onAypdgY1S65yTOYItY8R2gx7Jo+n+ZMoBhhU6qW/eDZIJmikywZ9apqQ70UfDAd8yRU6ucTLrQDA9Lk53Kytjcuzdj+hJVPzDHmOyNmUWnL71eEnjUHBTwTCcIwq8Cn64Yn6mrxbqqTZtSYhPuyT564ZIeU7snd4mFBXy+KI4PovxEM/a10C9eDgtiNJcW5hcbId0aXw/VTEg==|920 \ No newline at end of file diff --git a/Pages/f5fc8d78af50450e9ecd5e29f22c67b.json b/Pages/f5fc8d78af50450e9ecd5e29f22c67b.json index b9ee9707..84918e4d 100644 --- a/Pages/f5fc8d78af50450e9ecd5e29f22c67b.json +++ b/Pages/f5fc8d78af50450e9ecd5e29f22c67b.json @@ -263,7 +263,7 @@ "BreakpointIdentity": "ba6a32c8-ff95-4c82-a546-74a145b9ee37" } ], - "ID": "371f700d-f9dd-4d30-b595-f4cd1351ade6" + "ID": "d48b056e-0095-483f-92d2-b4e370a1e15f" }, { "CommandList": [ @@ -279,13 +279,13 @@ "BreakpointIdentity": "ffb91972-cda0-413f-9247-86910eae0ca1" } ], - "ID": "f4366eec-8aff-4915-abe8-026daaa55313" + "ID": "de2d8b4d-b825-43c2-af7d-dec3313298d6" } ], "BreakpointIdentity": "f7b54034-89b9-4f0d-981c-f915f2c722cd" } ], - "ID": "c5cce569-b5f4-4e64-a29c-bc817c9d103b" + "ID": "7788af3d-1814-469a-8b27-603934cbc664" } ], "BreakpointIdentity": "cf60cfc9-a4cf-4b3e-bd15-205f28bc7db3" @@ -301,7 +301,7 @@ } ], "Comments": "小于进行中", - "ID": "9aafe645-327f-489a-ae95-2e5c6862c956" + "ID": "7caf24ed-59d0-4925-a89d-3f36f5e70846" }, { "CommandList": [ @@ -312,7 +312,7 @@ "BreakpointIdentity": "bca78f27-26c0-4456-9d1a-f3eb0ce8c293" } ], - "ID": "1ec83ff3-e5f4-4241-964a-3b98e9daa20e" + "ID": "882d4af8-b940-46c1-ab85-cd63676d405f" } ], "BreakpointIdentity": "4e676f31-76a3-4421-9443-dbb2921b87df" @@ -481,7 +481,7 @@ "BreakpointIdentity": "ff6d7add-c748-42e1-a062-9f352fe56f29" } ], - "ID": "640fe946-9aa3-4b72-acbe-3668dfa2179e" + "ID": "72b1b556-6cf8-49fe-83c4-1e10171cb133" }, { "CommandList": [ @@ -492,13 +492,13 @@ "BreakpointIdentity": "0da9647e-31d9-4dc4-b3fd-25e5eab24937" } ], - "ID": "bb9ee6b1-1ed7-46ac-96d4-8e356d498a7c" + "ID": "5eec4dbf-1740-4ced-aed0-dec73a68b6ce" } ], "BreakpointIdentity": "d1e6a59f-447c-436d-9979-f5bdb95ae55f" } ], - "ID": "1d71bd39-8339-4842-b3e4-301e27534c9b" + "ID": "a75adc9d-f95a-40ab-942d-c38a3b0564cf" }, { "CommandList": [ @@ -539,19 +539,19 @@ "BreakpointIdentity": "718d3ce3-69e1-4a05-96a3-aa5e036be9e6" } ], - "ID": "43aed5da-13f6-43cd-b1b0-fe8ea3232b0a" + "ID": "2913bfe4-5dc3-42c3-a937-e6eb997a091d" } ], "BreakpointIdentity": "2301bb28-4595-42d2-b111-5c58847dd099" } ], - "ID": "11103d77-8277-43f1-8609-c7834d26e119" + "ID": "3674f3ca-e572-4629-97aa-32877b20cf76" } ], "BreakpointIdentity": "af0b59bd-f85c-49e2-b8ae-bd9138b84440" } ], - "ID": "f0abfd33-f6b6-416e-97c4-d490367261c9" + "ID": "f9f0a2bb-1e4b-48cd-b3bb-12b43ab99a30" }, { "CommandList": [ @@ -565,7 +565,7 @@ "BreakpointIdentity": "c250b6c9-38b5-4632-8850-34bab49b16a9" } ], - "ID": "a24342fa-6538-4377-a466-266531a3445d" + "ID": "2b2516fb-8331-47cc-aaa0-ee44d64f4950" } ], "BreakpointIdentity": "90be7f0f-8f20-46bd-afe9-7ab0d11a279d" @@ -800,4 +800,4 @@ "PaperSize": {}, "Margin": {} } -}//DZ96dlt/pLzDPjylKY8MGE8iQVXhOsVk7afC7fLiWK9U1/5E0vjrFdGHAnJSlAAFYe0YLafovi9fTXXkO4PMiUThnm4ybKXBzIEbWQcWcADj6I9vDwPKcwxkVqQpIJeM8oUxu8oyR/1rumTb6H0YoQpL7VmEqHUfZiNuJh278xOfq7FdTy999oZIu3gkUtxrs4NoELTau9HI0cw76ae6b4Zub4uL/0Bya4XQ8Zo8eXhEnS8s17dPsmiXqSDT9h+2Ikc3aiOqNrAo0B8pqnGKe24dfQAbbV6GR/75j4wSPFx7hiwl4oZXzzHET0W/DyC7C8LkwQoT5m3+ePPxvxgvhGCFMKmSbD2XJGVDlgGeoi4ls8VkGTbpVt8slDTvtu6tztc5s+4oJb+zLVk844h0jBhLqoz2LeReI6XVtp3hcihMFnuWw4aZL3Xv+BX2bb3f1WKAEklk/MzW7gnx8cf5Qf/7tkhEAxud2nBIc5ROr+xYsarwRDsB+2AvCcGGM2dfbM38AtuHLA6snEouaOx75W2q5IFcGlTHJuX1JwzaU09YoUQGipzHr+7ym36ogko3MnciPNbBT9WcBpl37EFNKI93w9w/9BWkyj+Eg29bhZ8ir6LPC0+4CABH9iKm2qjL+QDySHc50uGjOaWv9lVaO98DrmeQVzswQAmpg4/vYkjjVj32HHmyvQQbC524YP0xCT0So+ntmNGgXWa/oCtiNGx9QFNfiZqG3gKQccJfWwSrcGnHC0L4W3WkHb8XtP9YdkJauIEeL3jZyWfL2QvBBnZlK/bl1/oa2GLZWHS8uD1VHUo8F+oFX2DVzByjacyxhBBiNfpFx0J+1BHI6P5BlxnvXvrE5lK0VTlEswxGMG8t5gQAeDxmpHn0GQMNDPGnAWXUJExtm8aLu/8CqRkHJQ==|920 \ No newline at end of file +}//LeqGfJE849GCCQK6FAdzrgQkZiarO/7Cs4ySb53zZI1R12XMM0k0HQ6stu9T0dKaa1tq5m4j2kdnEHTSUi4MS1wGyi6sf7VJ/XET2S8nRjrqmfHlLKGdiy/clg8mNBHAqljTZLw4/fpv4YxOWNmjD1S7t0xQKKjxIKAlL84jvtKEMezu7zbwwyzwWvfEy99zRib/QQ2mk18nsIXGAovHrcto96hpR8BsPDEBr1D4mb+OglWKwZ/O7y7kr/ekxCzC/bdW49Q4qilX+krpWlq3U5CdSpyrlDOVd/IBPAr/JyqrXjxtz+35Oarx8k/UzHvtX5o2n+hSd2X6uNrgaBSaRfEqrF+pV+0r7cyKwb2s/WDQZqYmxCWqexNuw8Dy7EhsG/i/lJE5I74k3Yf0wAYkbSMkfm/Hx7WOwnQkEYgeGTA6qfI92OoqkCTRPJ1jTXdFuHOqJIq4aWqCscqYyjmqD70XnK2Ler6jwC9TRQ1eqkUwX11luvat0LIVIqExEIp5vULKZdgFvjLt4muOvqjXCualTSWwuKut/YURjNuduaTZ3ZDz7fKdZ7NmtYCaDVNgSsrOINamt2TDXMFffV2AePY15JKTprG1Ut5TIGqauiwQSzYW2CBAxK0Fc+bmvMmoEnUsE7XifdBbDr088aDCJ0WSyX4WVAhWMrD++oCUyDzSlCyV/SXkoabiTHuJmUR6YBYgl1nizhIWvGoHGLHbLAu8NS5S7ca9RM8xMauEqyDZp8UM8pfppL7zBf1IHkQcMusGzbL06UIJi8Lf9dD+di/tmZb/xXNAVQP+XavHEddBEPzbmFFqxK1/XklPyuyY6ChUOI8Td03SyD5PaL97tU7dP1NHrkqrXZGbG0GrYxLSPmsh7SzrIs3Xv4iAl72w26m+2XZquxIarYrs2z8NyA==|920 \ No newline at end of file diff --git a/Pages/任务/任务管理.json b/Pages/任务/任务管理.json index 035b92f1..3cc936cb 100644 --- a/Pages/任务/任务管理.json +++ b/Pages/任务/任务管理.json @@ -143,7 +143,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "4": { @@ -271,7 +271,7 @@ "DesignLengthInPixel": 32.0 } }, - "44": { + "30": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -283,6 +283,11 @@ } } }, + "44": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, "45": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 @@ -296,17 +301,15 @@ "1,1": "%PageTitle%", "3,1": "关键字", "5,1": "负责人", - "5,4": "%CurrentUser.UserName%", - "5,15": "日期", + "5,3": "%CurrentUser.UserName%", + "5,14": "日期", "7,1": "状态", - "7,15": "对象", - "7,17": "‘", - "9,1": "查询", - "9,4": "重置", + "7,14": "对象", + "7,16": "‘", "12,1": "任务管理_列头" }, "AttachInfos": { - "1,25": { + "1,31": { "CssName": "toolbar toolbar-right ", "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", @@ -570,7 +573,7 @@ "BreakpointIdentity": "acf0f614-7303-441e-a9d7-3127017f0e0c" } ], - "ID": "373ce41b-568d-49c7-b57c-b2b8114282f9" + "ID": "3d517982-da66-4332-9e39-663b6a480c0b" } ], "BreakpointIdentity": "cbfe7c4b-8d18-49ed-b8e6-8d2270feac9c" @@ -773,7 +776,7 @@ "BreakpointIdentity": "a2b32d07-1426-461d-bc19-9cb9da927777" } ], - "ID": "34f594da-327c-459a-bd42-54b7355f5dc7" + "ID": "354636ca-98be-4f0b-b0ea-5d62ca127025" } ], "BreakpointIdentity": "f517d3f0-0a8b-41b7-a984-0153f4f4b38d" @@ -979,7 +982,7 @@ ] } }, - "3,4": { + "3,3": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], @@ -1008,7 +1011,7 @@ "resize": "none" } }, - "5,4": { + "5,3": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -1084,7 +1087,7 @@ "noMatchText": "无匹配数据" } }, - "5,17": { + "5,16": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", "CommandList": [ @@ -1092,7 +1095,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务管理!R6" + "SerializeProperty": "=任务管理!Q6" }, "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "GetSelectedRange", @@ -1136,7 +1139,7 @@ "DefautWeekFormat": "yyyy 第 WW 周" } }, - "7,4": { + "7,3": { "CssName": "singlebox", "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", @@ -1160,7 +1163,7 @@ "NoneItemText": "全部" } }, - "7,17": { + "7,16": { "CssName": "singlebox", "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", @@ -1183,162 +1186,168 @@ ] } }, - "9,1": { + "9,3": { "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ + "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", + "UserControlPageName": "重置查询按钮", + "CommandHandlers": [ { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务管理!R6" - }, - "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedRange", - "RetrunParamNames": { - "StartValue": { - "SerializeProperty": "开始日期" - }, - "EndValue": { - "SerializeProperty": "结束日期" - } - }, - "BreakpointIdentity": "cf30819b-3710-439a-a3d9-241071415fe7" - }, - { - "$type": "Forguncy.Model.QueryCommand, ServerDesignerCommon", - "TargetTableName": "任务平行视图", - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ + "CommandName": "次按钮单击", + "Commands": { + "Commands": [ { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "ID", - "GUID": "1e4651c2-97d4-47ff-a358-97b9986c204f" - }, - "Value": { + "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务管理!关键字" + "SerializeProperty": "=任务管理!关键字,任务管理!负责人,任务管理!Q6,任务管理!任务类型,任务管理!任务状态" }, - "LeftBracket": 1 - }, - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 6, - "ColumnBindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "任务名称", - "GUID": "cad9c681-d7b9-46cb-922b-030bfb52109c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务管理!关键字" - }, - "RightBracket": 1 + "Value": "%Null%" } ], - "RelationType": 1 + "BreakpointIdentity": "51778a0e-31b0-41a9-86d6-cacf1b9286f4" }, { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 3, - "ColumnBindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "开始时间", - "GUID": "24a23742-e071-45fd-b3b2-8f3e4e0e8aa1" - }, - "Value": { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务管理!开始日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 5, - "ColumnBindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "结束时间", - "GUID": "c5d706c4-ade6-4062-bd98-fbfdb25d8aa5" + "SerializeProperty": "=任务管理!个人日报表格" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务管理!结束日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "任务类型", - "GUID": "1de69ee7-1dd0-49ad-9d24-79cea03d5035" + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务管理!任务类型" - } - }, - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 8, - "ColumnBindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "任务状态", - "GUID": "ff46d1d8-4197-4ec8-84fe-0584dd563454" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务管理!任务状态" - } + "BreakpointIdentity": "3bd04290-bee9-4153-8012-e1421f0a25cc" } - ] - }, - "ID": "ff5fab3405eb4c53af44fef4ae0d2932", - "BreakpointIdentity": "7ba462b9-99c5-41ea-968b-72c917c71076" - } - ], - "Text": "查询", - "TemplateKey": "_RS_Main1" - } - }, - "9,4": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务管理!关键字,任务管理!负责人,任务管理!R6,任务管理!任务类型,任务管理!任务状态" - }, - "Value": "%Null%" - } - ], - "BreakpointIdentity": "a9c9001e-b012-451b-ae56-a58e6c10ff9d" + ], + "ParamProperties": {} + } }, { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务管理!个人日报表格" - }, - "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "ResetTable", - "ParameterValues": { - "clearSort": true, - "clearFilter": true - }, - "BreakpointIdentity": "6748fd41-0361-4718-b1cd-76b3ac1a6057" + "CommandName": "主按钮单击", + "Commands": { + "Commands": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务管理!Q6" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "开始日期" + }, + "EndValue": { + "SerializeProperty": "结束日期" + } + }, + "BreakpointIdentity": "6380e00d-c2c6-4874-946b-56b8a5f9864a" + }, + { + "$type": "Forguncy.Model.QueryCommand, ServerDesignerCommon", + "TargetTableName": "任务平行视图", + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "ID", + "GUID": "232eb80b-c469-4066-8d8b-2e912712c48f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务管理!关键字" + }, + "LeftBracket": 1 + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务名称", + "GUID": "bb7a14cf-f340-4211-8948-6b5852940615" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务管理!关键字" + }, + "RightBracket": 1 + } + ], + "RelationType": 1 + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "开始时间", + "GUID": "ffa8b639-831a-458a-bf0c-fba20d496336" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务管理!开始日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 5, + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "结束时间", + "GUID": "922e8d8a-22af-48d5-9c60-637caf110057" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务管理!结束日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务类型", + "GUID": "5d6bd029-4920-4dec-b580-36e41b5f5458" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务管理!任务类型" + } + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务状态", + "GUID": "6fab9c7a-2535-456a-84ae-ff0593fa8a82" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务管理!任务状态" + } + } + ] + }, + "ID": "078e21bee09e4f9dac6663a2e427c75f", + "BreakpointIdentity": "6574ef03-03ef-4aa8-82d7-4b9acef2bb45" + } + ], + "ParamProperties": {} + } } - ], - "Text": "重置", - "TemplateKey": "_RS_Information3" + ] } }, "12,1": { @@ -1694,21 +1703,7 @@ "1,16": 2, "1,17": 2, "1,18": 2, - "1,25": 2, - "1,26": 2, - "1,27": 2, - "1,28": 2, - "1,29": 2, - "1,30": 2, "1,31": 2, - "1,37": 2, - "1,38": 2, - "1,39": 2, - "1,40": 2, - "1,41": 2, - "1,42": 2, - "1,43": 2, - "1,44": 2, "1,45": 0, "2,26": 3, "2,27": 2, @@ -1732,7 +1727,33 @@ "2,45": 0, "3,1": 4, "3,2": 2, - "3,4": 5, + "3,3": 3, + "3,4": 2, + "3,5": 2, + "3,6": 2, + "3,7": 2, + "3,8": 2, + "3,9": 2, + "3,10": 2, + "3,11": 2, + "3,12": 2, + "3,13": 2, + "3,14": 2, + "3,15": 2, + "3,16": 2, + "3,17": 2, + "3,18": 2, + "3,19": 2, + "3,20": 2, + "3,21": 2, + "3,22": 2, + "3,23": 2, + "3,24": 2, + "3,25": 2, + "3,26": 2, + "3,27": 2, + "3,28": 2, + "3,29": 2, "3,31": 5, "3,32": 5, "3,33": 5, @@ -1749,33 +1770,33 @@ "3,45": 0, "4,1": 5, "4,2": 5, - "4,3": 5, - "4,4": 5, - "4,5": 5, - "4,6": 5, - "4,7": 5, - "4,8": 5, - "4,9": 5, - "4,10": 5, - "4,11": 5, - "4,12": 5, - "4,13": 5, - "4,14": 5, - "4,15": 5, - "4,16": 5, - "4,17": 5, - "4,18": 5, - "4,19": 5, - "4,20": 5, - "4,21": 5, - "4,22": 5, - "4,23": 5, - "4,24": 5, + "4,3": 3, + "4,4": 3, + "4,5": 3, + "4,6": 3, + "4,7": 3, + "4,8": 3, + "4,9": 3, + "4,10": 3, + "4,11": 3, + "4,12": 3, + "4,13": 3, + "4,14": 3, + "4,15": 3, + "4,16": 3, + "4,17": 3, + "4,18": 3, + "4,19": 3, + "4,20": 3, + "4,21": 3, + "4,22": 3, + "4,23": 3, + "4,24": 2, + "4,25": 3, "4,26": 3, "4,27": 3, "4,28": 3, "4,29": 3, - "4,30": 3, "4,31": 3, "4,32": 3, "4,33": 3, @@ -1793,12 +1814,33 @@ "4,45": 0, "5,1": 4, "5,2": 2, - "5,3": 2, - "5,4": 3, - "5,14": 2, - "5,15": 4, - "5,16": 2, - "5,17": 3, + "5,3": 3, + "5,4": 2, + "5,5": 2, + "5,6": 2, + "5,7": 2, + "5,8": 2, + "5,9": 2, + "5,10": 2, + "5,11": 2, + "5,12": 2, + "5,13": 2, + "5,14": 4, + "5,15": 2, + "5,16": 3, + "5,17": 2, + "5,18": 2, + "5,19": 2, + "5,20": 2, + "5,21": 2, + "5,22": 2, + "5,23": 2, + "5,24": 2, + "5,25": 2, + "5,26": 2, + "5,27": 2, + "5,28": 2, + "5,29": 2, "5,31": 3, "5,32": 3, "5,33": 3, @@ -1813,8 +1855,33 @@ "5,42": 3, "5,43": 3, "5,45": 0, + "6,3": 2, + "6,4": 2, + "6,5": 2, + "6,6": 2, + "6,7": 2, + "6,8": 2, + "6,9": 2, + "6,10": 2, + "6,11": 2, + "6,12": 2, + "6,13": 2, + "6,14": 2, + "6,15": 2, + "6,16": 2, + "6,17": 2, + "6,18": 2, + "6,19": 2, + "6,20": 2, + "6,21": 2, + "6,22": 2, + "6,23": 2, + "6,24": 2, + "6,25": 2, + "6,26": 2, + "6,27": 2, + "6,28": 3, "6,29": 3, - "6,30": 3, "6,31": 3, "6,32": 3, "6,33": 3, @@ -1831,8 +1898,8 @@ "6,45": 0, "7,1": 4, "7,2": 2, - "7,3": 2, - "7,4": 6, + "7,3": 6, + "7,4": 2, "7,5": 2, "7,6": 2, "7,7": 2, @@ -1842,10 +1909,22 @@ "7,11": 2, "7,12": 2, "7,13": 2, - "7,14": 2, - "7,15": 4, - "7,16": 2, - "7,17": 7, + "7,14": 4, + "7,15": 2, + "7,16": 7, + "7,17": 2, + "7,18": 2, + "7,19": 2, + "7,20": 2, + "7,21": 2, + "7,22": 2, + "7,23": 2, + "7,24": 2, + "7,25": 2, + "7,26": 2, + "7,27": 2, + "7,28": 2, + "7,29": 2, "7,37": 3, "7,38": 3, "7,39": 3, @@ -1856,33 +1935,33 @@ "7,45": 0, "8,1": 5, "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, - "8,21": 5, - "8,22": 5, - "8,23": 5, - "8,24": 5, + "8,3": 3, + "8,4": 3, + "8,5": 3, + "8,6": 3, + "8,7": 3, + "8,8": 3, + "8,9": 3, + "8,10": 3, + "8,11": 3, + "8,12": 3, + "8,13": 3, + "8,14": 3, + "8,15": 3, + "8,16": 3, + "8,17": 3, + "8,18": 3, + "8,19": 3, + "8,20": 3, + "8,21": 3, + "8,22": 3, + "8,23": 3, + "8,24": 2, + "8,25": 3, "8,26": 3, "8,27": 3, "8,28": 3, "8,29": 3, - "8,30": 3, "8,31": 3, "8,32": 3, "8,33": 3, @@ -1898,34 +1977,33 @@ "8,43": 3, "8,44": 3, "8,45": 0, - "9,1": 3, "9,3": 2, - "9,4": 3, + "9,4": 2, "9,5": 2, - "9,6": 5, - "9,7": 5, - "9,8": 5, - "9,9": 5, - "9,10": 5, - "9,11": 5, - "9,12": 5, - "9,13": 5, - "9,14": 5, - "9,15": 5, - "9,16": 5, - "9,17": 5, - "9,18": 5, - "9,19": 5, - "9,20": 5, - "9,21": 5, - "9,22": 5, - "9,23": 5, - "9,24": 5, + "9,6": 2, + "9,7": 2, + "9,8": 2, + "9,9": 2, + "9,10": 2, + "9,11": 3, + "9,12": 3, + "9,13": 3, + "9,14": 3, + "9,15": 3, + "9,16": 3, + "9,17": 3, + "9,18": 3, + "9,19": 3, + "9,20": 3, + "9,21": 3, + "9,22": 3, + "9,23": 3, + "9,24": 2, + "9,25": 3, "9,26": 3, "9,27": 3, "9,28": 3, "9,29": 3, - "9,30": 3, "9,31": 3, "9,32": 3, "9,33": 3, @@ -2049,25 +2127,24 @@ } }, "Spans": [ - "9,1,1,2", - "9,4,1,2", "21,1,1,4", "2,26,1,3", "21,6,1,3", "21,9,1,3", "3,1,1,2", - "1,25,1,20", - "5,15,1,2", "5,1,1,2", "7,1,1,2", - "7,4,1,10", - "7,15,1,2", "13,1,7,44", - "5,17,1,14", - "3,4,1,27", - "5,4,1,10", - "7,17,1,14", - "12,1,1,44" + "12,1,1,44", + "5,14,1,2", + "7,3,1,10", + "7,14,1,2", + "5,16,1,14", + "3,3,1,27", + "5,3,1,10", + "7,16,1,14", + "9,3,1,5", + "1,31,1,14" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2105,11 +2182,11 @@ "CustomNames": [ { "Name": "关键字", - "Formula": "任务管理!$E$4" + "Formula": "任务管理!$D$4" }, { "Name": "负责人", - "Formula": "任务管理!$E$6" + "Formula": "任务管理!$D$6" }, { "Name": "结束日期", @@ -2125,11 +2202,11 @@ }, { "Name": "任务状态", - "Formula": "任务管理!$R$8" + "Formula": "任务管理!$Q$8" }, { "Name": "任务类型", - "Formula": "任务管理!$E$8" + "Formula": "任务管理!$D$8" } ] -}//sZJJ6UtnGNL4tbik0lIxv02D6XlSAn76cxb2sElPgcEIeBtIbMVQq97bnPtQdzI795arMhYH4q8lOAD/T8TkvK0V7c22STuAXPsz4tlHxk6BkQIRv3DXvXUlRyR1nuZYKGTIfyYAXxP12VNe41hVw4XBTOwgA6P1s949yx0QA57AP86APl81iEBMScGsU9a07tF4eRJTCqoZTH6JqhtCmf9zyC+oVMAGu4bgD8rpTmzGPWZwlCLbVwyv0C10d0OoK8VnyZY3XulTM5a+cOQEvXYli7V1K9rjsq5Ik91qlSqDZzi4z9JzdQG1B3npvx6iariZBL4KiSqbuY216m1PJgCNQnv5wsJUAOc2dFsA5cBQfsgqhjfh6cK8cHq/ROiXC5UxXr6PVAin7ExZz6+ZMlDamWajKeMT/IIoqRKXT8U2pAV1xOk3tIa50v5IJE3r8u3Aijnel9gTdDn+EUA/pjbiALqtNw10f4sGctNayyifRfOiIuPxN/yxs3j5VASk5sPO8JHTH5/BEJg+z2Td0DyQU8uuAZijoJVs1QeXXAM+4gHYTH9JbaLgKnOgGc7uwl2USM6IV+AGuATkVR2kPDbRiN6f+utHLa9Xm9lj322n5eVSulY2qBvhEXjVd2VkmDdvPB3VczjAXw+B3I6fZ16uuJcV/bKq/EQsn19pG7wWJwjj571qAhhbxKfBDv8XqqyLEmNImBgAEOo26D0vVCRvvby3tce/Br0lNQVoGvCNrEfoBZv7oPTn8EJsczFcPbLmQQLdNCsnEH7Q6ssIHQn1b9LRwpSjyjK1KKoGFrM/v7MImt8gfK3rgSuvSz9/9jkel/ngQsqfoU+31GKz7m7EqE2ODEvqbw/sghxVhHWkN9ni2sDW8NxPLArVAlIz6i4TaL75fkxgpFwJKdh74A==|920 \ No newline at end of file +}//75DRKZkNVN/umRsOd7+f1NxVBnYEAL0qoQcOaQNGwj3HQ/Z5dWYWU3972IbBs6IR3dLWlldxIo3pSWBbVwYPpS8KJZQDUWwzD5xquY3rQZTcfBvyepOY90hmuhgoBq+Bco6kbljDJe+XLPlcLYiu+k3s2Veoou65uSLGvR6kUO9Ma0TlgjkoXvvbKi8a8ajS+3QKz4BpXNFlDGYAKEqUTJkqu/FnXEd3jWQ6TRpV6ZfATlVKycB2sT8VKcC+x9/EHD82UvkrpceClolfs4lZexjuQdkPOUGJLQ29w6XMbkbVUwZzDuZRxPLdTOXayTDTrQD27mmJItpRGknbKGnVgZwNdf9vYd8gK+oFu11rkE34/xFNTvVG4y8naIOehDZ33pKgg7CaJWAzZFgVrMSUXCjYIA7NQSOQiPKQICHZaHMN29Chl7O6XXKiDMWccC8Kmu2B7TxQJMgd5yrqXnWpcylb6zaG1I5f13ocyOaUBqwuBHe8d1GF3TX3lYrXDe4M1ZxivBHrVWp+wJcj/ByHqYXcCRnlcCg3xVlTtGqJD13qqJN4R4G4roWs/GG9+EI1RTQzwZEA8Y2quS3S55FztnR3N7JUes6M7tAJ+MNYdvR1qDCAUFfTN+Q7nNW98476K233Cl9cYX7CBaC1ap86q5ZLtfYTwY364O4pRUO/vtDeGv/RJK93PDUi6ko0xUj6vSYG2H2gS5hyw3iCCgPiNzTPj9Me9aq6ufjyuIW2fGrqV+jAtRg2LyyuhTb8Ep5qIvlrCBHHGBs7Uxl8nzhRt1PtLvPf+FmIkbwuBiTJX9FG3VJ4WXM8Ue02xLZviQTGqAYD3kWIXmXG8FWatTCdL38s2Ru/9jOmY4fTmSR8Z8Idc25rRv9GaaZq1+VlPCmmG3nwHxMub0W/C89T1eAWyQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务管理.rd b/Pages/任务/任务管理.rd index d94428f9..2ff76050 100644 --- a/Pages/任务/任务管理.rd +++ b/Pages/任务/任务管理.rd @@ -5,11 +5,11 @@ "CustomNames": [ { "Name": "关键字", - "Formula": "任务管理!$E$4" + "Formula": "任务管理!$D$4" }, { "Name": "负责人", - "Formula": "任务管理!$E$6" + "Formula": "任务管理!$D$6" }, { "Name": "结束日期", @@ -25,11 +25,11 @@ }, { "Name": "任务状态", - "Formula": "任务管理!$R$8" + "Formula": "任务管理!$Q$8" }, { "Name": "任务类型", - "Formula": "任务管理!$E$8" + "Formula": "任务管理!$D$8" } ] } \ No newline at end of file diff --git a/Pages/会议/会议管理.json b/Pages/会议/会议管理.json index e5796f19..e63952ad 100644 --- a/Pages/会议/会议管理.json +++ b/Pages/会议/会议管理.json @@ -8,27 +8,52 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 40.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 24.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 10.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 617.0, + "DesignLengthInPixel": 35.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 6.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 506.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -38,22 +63,35 @@ } } }, - "6": { + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } }, - "7": { + "13": { "GridRowColumnDefinition": { "DesignLengthInPixel": 28.0 } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, "InLogicalVisibleIndexes": [ - 7 + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 13 ], - "Count": 8, - "DefaultSize": 32.0 + "Count": 14, + "DefaultSize": 24.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -202,12 +240,12 @@ "DesignLengthInPixel": 32.0 } }, - "29": { + "32": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "40": { + "35": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -219,34 +257,182 @@ } } }, - "41": { + "38": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "44": { + "42": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "45": { + "46": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "47": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } } }, - "Count": 46, + "Count": 48, "DefaultSize": 32.0 }, "Values": { "1,1": "%PageTitle%", - "3,1": "日期", - "3,17": "人员", - "3,28": "关键字", - "3,42": "发起会议" + "3,1": "关键字", + "5,1": "日期", + "5,22": "人员" }, "AttachInfos": { + "1,39": { + "CssName": "toolbar toolbar-right ", + "CellType": { + "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", + "TemplateKey": "横向迷你菜单", + "Items": [ + { + "Value": "菜单1", + "Text": "筛选数据", + "IconPath": "Application/044_search_5.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议管理!显示搜索栏" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT(会议管理!显示搜索栏)" + } + } + ], + "BreakpointIdentity": "21902c20-6793-4024-96dd-fc89123d941d" + } + ], + "CanVisitRoleList": [ + "FGC_Anonymous" + ] + }, + { + "Value": "菜单1", + "Text": "发起会议", + "IconPath": "Application/001_add_1.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 3, + "DrawerDirection": 3, + "ShowDrawerHeader": true, + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "图文列表表格1", + "UpdateType": 6, + "UpdateListviewCommandRunTimeMethodSetting": { + "MethodName": "Reload", + "ParameterValues": { + "clearFilter": false, + "clearSort": false, + "clearRuntimeQueryConditions": false + } + }, + "BreakpointIdentity": "c57fd584-34ef-4a17-b6ff-128bb2e23f21" + } + ], + "ID": "b9b44d41-5ab6-4d79-9939-442b8922add4" + } + ], + "BreakpointIdentity": "1b9971fc-5e6a-4671-9c15-ffac6ebace5d" + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, + "PageName": "发起钉钉会议", + "BreakpointIdentity": "173dd9be-2e50-4b9c-a0b1-b303a2c5d1b2" + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + } + ], + "Orientation": 0, + "MenuLevelsStyle": [ + { + "FontSize": 13.333333333333332, + "Bold": false, + "Height": 32.0, + "IconHeight": 14.0, + "IconWidth": 14.0 + } + ] + } + }, "3,3": { + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "placeholder": "请选择", + "resize": "none" + } + }, + "5,3": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", "CommandList": [ @@ -254,7 +440,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=会议管理!D4" + "SerializeProperty": "=会议管理!D6" }, "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "GetSelectedRange", @@ -297,7 +483,7 @@ "DefautWeekFormat": "yyyy 第 WW 周" } }, - "3,19": { + "5,24": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -383,60 +569,36 @@ "clearable": true } }, - "3,30": { + "7,3": { "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ + "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", + "UserControlPageName": "重置查询按钮", + "CommandHandlers": [ { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] + "CommandName": "次按钮单击", + "Commands": { + "Commands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议管理!D4,会议管理!D6,会议管理!Y6" + }, + "Value": "%Null%" + } + ], + "BreakpointIdentity": "01e9f39d-9dba-4afd-9ce5-ed5c09684864" + } + ], + "ParamProperties": {} + } } - ], - "type": "text", - "placeholder": "请选择", - "resize": "none" + ] } }, - "3,42": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PopupDisplayMode": 3, - "DrawerDirection": 3, - "ShowDrawerHeader": true, - "PageName": "发起钉钉会议", - "BreakpointIdentity": "c61e6bfc-22f8-4954-8005-9ffddac9bf8c" - } - ], - "Text": "发起会议", - "TemplateKey": "_RS_Main1", - "Icon": { - "Name": "Application/001_add_1.svg", - "BuiltIn": true, - "Color": "Background 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - } - }, - "5,1": { + "11,1": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "502ee1db03c84e88a5a54340cf07e2c", @@ -610,7 +772,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=会议管理!AE4" + "SerializeProperty": "=会议管理!D4" } }, { @@ -625,7 +787,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=会议管理!T4" + "SerializeProperty": "=会议管理!Y6" }, "LeftBracket": 1 }, @@ -639,7 +801,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=会议管理!T4" + "SerializeProperty": "=会议管理!Y6" }, "RightBracket": 1 } @@ -688,30 +850,57 @@ }, "TemplateKey": "BlackWhite" } + }, + "13,9": { + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "Caption": "显示搜索栏", + "Style": 1, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议管理!4:11" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议管理!J14" + } + } + ], + "BreakpointIdentity": "4a0ec1ac-4eff-4549-906c-f035fda0c3ed" + } + ] + } } }, "StyleDatas": { "Styles": [ { - "FontSize": 24.0 + "FontFamily": 0, + "FontSize": 18.666666666666664, + "FontWeight": 1 }, { "FontFamily": 0 }, { + "FontFamily": 0, "FontSize": 13.333333333333332 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Formatter": 1 + "Formatter": 2 }, { - "FontFamily": 0, "FontSize": 13.333333333333332 }, { - "HorizontalAlignment": 2 + "HorizontalAlignment": 3 }, { "FontSize": 13.333333333333332, @@ -725,104 +914,98 @@ "BorderTop": 0, "BorderLeft": 0, "BorderRight": 0 + }, + { + "Background": null } ], "Types": { "Strs": [ "Body", + "Bold", "[AUTO]General", "Center", "black" ], "Borders": [ { - "Color": 3 + "Color": 4 } ] }, "CellStyles": { "1,1": 0, + "1,39": 1, "2,16": 1, "3,1": 2, + "3,2": 1, "3,3": 2, - "3,17": 3, - "3,18": 1, - "3,19": 4, - "3,20": 1, - "3,21": 1, - "3,22": 1, - "3,23": 1, - "3,24": 1, - "3,25": 1, - "3,26": 1, - "3,28": 4, - "3,29": 1, - "3,30": 4, - "3,31": 1, - "3,32": 1, - "3,33": 1, - "3,34": 1, - "3,35": 1, - "3,36": 1, - "3,37": 1, - "3,38": 1, - "3,39": 1, - "3,40": 1, - "3,41": 2, - "3,42": 2, - "5,1": 5, - "6,1": 5, - "6,2": 5, - "6,3": 5, - "6,4": 5, - "6,5": 5, - "6,6": 5, - "6,7": 5, - "6,8": 5, - "6,9": 5, - "6,10": 5, - "6,11": 5, - "6,12": 5, - "6,13": 5, - "6,14": 5, - "6,15": 5, - "6,16": 5, - "6,17": 5, - "6,18": 5, - "6,19": 5, - "6,20": 5, - "6,21": 5, - "6,22": 5, - "6,23": 5, - "6,24": 5, - "6,25": 5, - "6,26": 5, - "6,27": 5, - "6,28": 5, - "6,29": 5, - "6,30": 5, - "6,31": 5, - "6,32": 5, - "6,33": 5, - "6,34": 5, - "6,35": 5, - "6,36": 5, - "6,37": 5, - "6,38": 5, - "6,39": 5, - "6,40": 5, - "6,41": 5, - "6,42": 5, - "6,43": 5, - "6,44": 5, - "7,1": 6, - "7,2": 7, - "7,3": 7, - "7,4": 7, - "7,5": 6, - "7,6": 7, - "7,7": 7, - "7,8": 7, + "4,16": 1, + "5,1": 2, + "5,2": 1, + "5,3": 2, + "5,22": 3, + "5,23": 1, + "5,24": 2, + "5,25": 1, + "5,26": 1, + "5,27": 1, + "5,28": 1, + "5,29": 1, + "5,30": 1, + "5,31": 1, + "5,32": 1, + "5,33": 1, + "5,34": 1, + "5,39": 2, + "5,40": 2, + "5,41": 2, + "5,42": 4, + "5,43": 4, + "6,1": 2, + "6,2": 2, + "6,3": 2, + "6,4": 2, + "6,5": 2, + "6,6": 2, + "6,7": 2, + "6,8": 2, + "6,9": 2, + "6,10": 2, + "6,11": 2, + "6,12": 2, + "6,13": 2, + "6,14": 2, + "6,15": 2, + "6,16": 2, + "6,17": 2, + "6,18": 2, + "6,19": 2, + "6,20": 2, + "6,22": 3, + "6,23": 3, + "6,24": 2, + "6,25": 2, + "6,26": 2, + "6,27": 2, + "6,28": 2, + "6,29": 2, + "6,30": 2, + "6,31": 2, + "6,32": 2, + "6,33": 2, + "6,34": 2, + "6,39": 2, + "6,40": 2, + "6,41": 2, + "6,42": 4, + "6,43": 4, + "6,44": 4, + "6,45": 4, + "6,46": 4, + "7,1": 2, + "7,2": 2, + "7,8": 2, "7,9": 2, "7,10": 2, "7,11": 2, @@ -835,9 +1018,8 @@ "7,18": 2, "7,19": 2, "7,20": 2, - "7,21": 2, - "7,22": 2, - "7,23": 2, + "7,22": 3, + "7,23": 3, "7,24": 2, "7,25": 2, "7,26": 2, @@ -849,33 +1031,208 @@ "7,32": 2, "7,33": 2, "7,34": 2, - "7,35": 2, - "7,36": 2, - "7,37": 2, - "7,38": 2, "7,39": 2, "7,40": 2, "7,41": 2, - "7,42": 2, - "7,43": 2, - "7,44": 2, - "7,45": 2 + "7,42": 4, + "7,43": 4, + "7,44": 4, + "7,45": 4, + "7,46": 4, + "8,1": 2, + "8,2": 2, + "8,3": 2, + "8,4": 2, + "8,5": 2, + "8,6": 2, + "8,7": 2, + "8,8": 2, + "8,9": 2, + "8,10": 2, + "8,11": 2, + "8,12": 2, + "8,13": 2, + "8,14": 2, + "8,15": 2, + "8,16": 2, + "8,17": 2, + "8,18": 2, + "8,19": 2, + "8,20": 2, + "8,22": 3, + "8,23": 3, + "8,24": 2, + "8,25": 2, + "8,26": 2, + "8,27": 2, + "8,28": 2, + "8,29": 2, + "8,30": 2, + "8,31": 2, + "8,32": 2, + "8,33": 2, + "8,34": 2, + "8,39": 2, + "8,40": 2, + "8,41": 2, + "8,42": 4, + "8,43": 4, + "8,44": 4, + "8,45": 4, + "8,46": 4, + "9,1": 2, + "9,2": 2, + "9,3": 2, + "9,4": 2, + "9,5": 2, + "9,6": 2, + "9,7": 2, + "9,8": 2, + "9,9": 2, + "9,10": 2, + "9,11": 2, + "9,12": 2, + "9,13": 2, + "9,14": 2, + "9,15": 2, + "9,16": 2, + "9,17": 2, + "9,18": 2, + "9,19": 2, + "9,20": 2, + "9,22": 3, + "9,23": 3, + "9,24": 2, + "9,25": 2, + "9,26": 2, + "9,27": 2, + "9,28": 2, + "9,29": 2, + "9,30": 2, + "9,31": 2, + "9,32": 2, + "9,33": 2, + "9,34": 2, + "9,39": 2, + "9,40": 2, + "9,41": 2, + "9,42": 4, + "9,43": 4, + "9,44": 4, + "9,45": 4, + "9,46": 4, + "11,1": 5, + "12,1": 5, + "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, + "12,21": 5, + "12,22": 5, + "12,23": 5, + "12,24": 5, + "12,25": 5, + "12,26": 5, + "12,27": 5, + "12,28": 5, + "12,29": 5, + "12,30": 5, + "12,31": 5, + "12,32": 5, + "12,33": 5, + "12,34": 5, + "12,35": 5, + "12,36": 5, + "12,37": 5, + "12,38": 5, + "12,39": 5, + "12,40": 5, + "12,41": 5, + "12,42": 5, + "12,43": 5, + "12,44": 5, + "12,45": 5, + "12,46": 5, + "13,1": 6, + "13,2": 7, + "13,3": 7, + "13,4": 7, + "13,5": 6, + "13,6": 7, + "13,7": 7, + "13,8": 7, + "13,9": 4, + "13,13": 4, + "13,14": 4, + "13,15": 4, + "13,16": 4, + "13,17": 4, + "13,18": 4, + "13,19": 4, + "13,20": 4, + "13,21": 4, + "13,22": 4, + "13,23": 4, + "13,24": 4, + "13,25": 4, + "13,26": 4, + "13,27": 4, + "13,28": 4, + "13,29": 4, + "13,30": 4, + "13,31": 4, + "13,32": 4, + "13,33": 4, + "13,34": 4, + "13,35": 4, + "13,36": 4, + "13,37": 4, + "13,38": 4, + "13,39": 4, + "13,40": 4, + "13,41": 4, + "13,42": 4, + "13,43": 4, + "13,44": 4, + "13,45": 4, + "13,46": 4, + "13,47": 4 + }, + "RowStyles": { + "9": 8 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ + "13,1,1,4", + "13,5,1,4", + "11,1,1,46", "3,1,1,2", - "3,3,1,13", - "7,1,1,4", - "7,5,1,4", - "5,1,1,44", - "3,42,1,3", - "3,17,1,2", - "3,19,1,8", - "3,28,1,2", - "3,30,1,11" + "1,39,1,8", + "13,9,1,4", + "5,1,1,2", + "5,22,1,2", + "5,24,1,11", + "5,3,1,18", + "3,3,1,32", + "7,3,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -910,14 +1267,31 @@ "PaperSize": {}, "Margin": {} }, + "BackgroundPictures": [ + { + "FitToBrowserWidth": true, + "Name": "5f38ca34-7f2a-4d99-a5e6-bd59173fd8ee.png", + "DisplayName": "背景图1", + "StyleInfo": { + "Fill": "Background 2 0" + }, + "IsAutomaticFill": false, + "Location": "0,243", + "Size": "1528,6" + } + ], "CustomNames": [ { "Name": "开始日期", - "Formula": "会议管理!$B$8" + "Formula": "会议管理!$B$14" }, { "Name": "结束日期", - "Formula": "会议管理!$F$8" + "Formula": "会议管理!$F$14" + }, + { + "Name": "显示搜索栏", + "Formula": "会议管理!$J$14" } ] -}//eo0j41NzZhaj6MOL9IN80Xqhin+tlPQx+yOFQ6577L2AMHC1nY82gX+DqFg/iKIg7nyAVN0lSwY0VnNHJoDdkOrZb2ZNYtQpZacz7HI3bGfYWt4olU5eCWjxHwJBP4eSU4IntLsMLa37o5zIXX3xBkXsKz6YVkn8wuE4g+pMIfA0rR+T2/C14La9TrrIp1JSiQbS6yws+oae5GgWFl1RtVi/mQgbP2tMGqAqjXVM+ouZYxjiMCQlHFuq/cWhdLPG1PRLjwyjE5czLlkIK2q5EqgbaXGfi8TbReWbwKgVhwszK3YO9HrgDMea17lNKa/23YkU0BZTG0gZP1XzkL14vj2vseSfARz6M4yNhDzokVYL7qdJH3rmBdWLF1wTn8xCLapAqNBylB4Bww+wtSmEmuu/TxnjJfJL8mSdtOGH46WMt+uVZUPW42DPBSGQ13wZBJyThuk8lLKc/K2DK4PN5HDznXhYnR1pZdb4D/r15TcjYW23MKLytm2sO22yN6nel3O9wZGLt/2vH5ShOarPjSYxaELfBpgVKlvAN25pLytiovCFj37lZacT4fT9+5VPTHy3FsFZPd7ogGfl3rTchQ8Jf1+9s36xpixkFk1FVk95Bw1XrYMGpaAaLJg7exIQjlHwucyjB8C4UqgdAF+xT9SN0Rxo43sOA2sDpem6A1ixIuosnxmCXRSe1GVxOgsGJ0hEKT/PkGRv+mlcbZB97iL8ZtQa430GDL8+ZzSLanSdrX8ElAW5SO6jICL4U5T9Jey6BAXDUEb+6WgZ6b9WZf3/JKhuvgukFwJV3/HHdoIZSJ/NG1+dx/2Lbq7TeqktyXK3NtRlJGbpQYGcHTdRxz0I47+NnZcdRDRzepHKqZGlxrAgja4ST6yo5r/s1Q6/RI8RC0zZshsbbGQ2eyN+GA==|920 \ No newline at end of file +}//GHo8QGCzhRC9DWHrx1kuJfATrvazM/HTQBr54JNyPPA3JxlzV3RIqx7PWxyyeZPJlxseed5sQcagVMgsHtmPiqMJgZ0NJBvewzMI9VXaG4bqj2I1G3+XUzPI/cK4+tPmBDFkvuaw4/sYweF+oAOGuVPiYT63AunCaE5cPV3K10bHcXgN2h0+Wsfk7Ip3iZbJUjY6LWPqNAtTuSx9U0CDwSKaI2g1H1uDV2JegnF+zhQW32Q0mkFDVNa2YYW0Qzs5H6gddNHdz1VgCRA7QcE0GD4/DLszVxxyKfWiPP950sOg9fHW5DDbNwddzlnUh3o/s5RG+7YEKVQNWi1DqEY/A9SkG9CrDUgnnkvMgBuSS+CYygpzonZzVIUd0nCdI40A5ROkXBPix2t83zs2ABwfk0FjC48zYtB8IRTqB/RnxlbGuzfZG491EUilzAnypwbhAWn3E/EdRU8O5OdWOU6BsXV5hfkg3v19oOiASKd2OpK9MawKHoar2eyP0hfargZdiRb2Dl4GCe9T6xUz6g8q6CoZ4ZgZzvIhRwDF1dtkjmZX38TiZJWjDwO435hXAEB5YiNgYyyqlD7PYaXj4cl5dRIRc1avin10bYd4gj6AZxY5iJvu+P9HBfAnMZlDzLSW9Qnl5vrXFFWq87DEzPy7WE2NZofden71Vh+vt9Z9OpOQ2jOhxhzYxj7a9X8t0EH4xNM2ku8njdv8DF/uVf0QcA5b8N+WHKVTnrVItkNYGgVC4/sXBXm360+a4t/Vj4Y3m5As3r7Vm3xXZN2XquhFBVLnWqS6OnJ8sJoMokE6EBM4J9zklpg43BORg3DbYjOkIvu7+U3aajaqIjOuwciJcFgXUbRo9mFgpPl5wAhk+4TPbIpB4O7kqZgMafUCKyK5kH0/+vUljc7JjHqv55z77g==|920 \ No newline at end of file diff --git a/Pages/会议/会议管理.rd b/Pages/会议/会议管理.rd index a764076f..6cd4bb89 100644 --- a/Pages/会议/会议管理.rd +++ b/Pages/会议/会议管理.rd @@ -1,15 +1,19 @@ { "PageType": 0, - "ColumnCount": 46, - "RowCount": 8, + "ColumnCount": 48, + "RowCount": 14, "CustomNames": [ { "Name": "开始日期", - "Formula": "会议管理!$B$8" + "Formula": "会议管理!$B$14" }, { "Name": "结束日期", - "Formula": "会议管理!$F$8" + "Formula": "会议管理!$F$14" + }, + { + "Name": "显示搜索栏", + "Formula": "会议管理!$J$14" } ] } \ No newline at end of file diff --git a/Pages/客户/客户管理.json b/Pages/客户/客户管理.json index b51513ea..2e963438 100644 --- a/Pages/客户/客户管理.json +++ b/Pages/客户/客户管理.json @@ -43,12 +43,12 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 6.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "11": { @@ -127,6 +127,11 @@ } }, "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -138,39 +143,40 @@ } } }, - "27": { + "28": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } }, - "28": { + "29": { "GridRowColumnDefinition": { "DesignLengthInPixel": 38.0, "Mode": 1 } }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "30": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, "InLogicalVisibleIndexes": [ - 2, 3, 4, 5, 6, 7, 8, - 30 + 9, + 10, + 31 ], - "Count": 31, + "Count": 32, "DefaultSize": 32.0 }, "Cols": { @@ -192,7 +198,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "4": { @@ -282,7 +288,14 @@ }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "22": { @@ -322,14 +335,7 @@ }, "29": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "30": { @@ -399,12 +405,10 @@ "1,31": "客户信息子页面", "3,1": "关键字", "5,1": "分组", - "5,16": "负责人", - "7,1": "查询", - "7,4": "重置" + "5,11": "负责人" }, "AttachInfos": { - "1,18": { + "1,22": { "CssName": "toolbar toolbar-right ", "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", @@ -474,7 +478,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=客户管理!B11" + "SerializeProperty": "=客户管理!B12" }, "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "ResetTable", @@ -485,7 +489,7 @@ "BreakpointIdentity": "fe3db016-e0c1-412b-ae68-ced343dd5996" } ], - "ID": "96649831-b928-40ca-b518-222d39f50f9a" + "ID": "fc41ab66-8d6e-465d-9ce2-975801361684" } ], "BreakpointIdentity": "680acf12-9c4c-4ea3-8456-aa87a104929a" @@ -524,7 +528,7 @@ "OverflowMode": 1 } }, - "3,4": { + "3,3": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], @@ -553,7 +557,7 @@ "resize": "none" } }, - "5,4": { + "5,3": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -628,7 +632,7 @@ "noMatchText": "无匹配数据" } }, - "5,19": { + "5,14": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -703,50 +707,50 @@ "noMatchText": "无匹配数据" } }, - "7,1": { + "7,3": { "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "Text": "查询", - "TemplateKey": "_RS_Main1" - } - }, - "7,4": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ + "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", + "UserControlPageName": "重置查询按钮", + "CommandHandlers": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=客户管理!E4,客户管理!E6,客户管理!T6" + "CommandName": "次按钮单击", + "Commands": { + "Commands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户管理!G4,客户管理!G6,客户管理!R6" + }, + "Value": "%Null%" + } + ], + "BreakpointIdentity": "8391052b-c8a4-4bfc-b415-f61784ffd5f2" }, - "Value": "%Null%" - } - ], - "BreakpointIdentity": "d587fac6-20e2-43ef-bbd2-8bc52b5dfa42" - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=客户管理!B11" - }, - "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "ResetTable", - "ParameterValues": { - "clearSort": true, - "clearFilter": true - }, - "BreakpointIdentity": "0cd9a4b9-7619-4a50-bb1f-479a83d023d6" + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户管理!E12" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true + }, + "BreakpointIdentity": "c4187020-4ea8-43e9-947c-a2aa38502037" + } + ], + "ParamProperties": {} + } } - ], - "Text": "重置", - "TemplateKey": "_RS_Information3" + ] } }, - "10,1": { + "11,1": { "CellType": { "$type": "ElementUI.TableCellType, ElementUI", "ElTableName": "EL表格1", @@ -836,7 +840,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=客户管理!B11" + "SerializeProperty": "=客户管理!B12" }, "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "ResetTable", @@ -847,7 +851,7 @@ "BreakpointIdentity": "20f8a3fe-537b-41eb-b22b-2e3684674a3f" } ], - "ID": "85aa3d05-27bc-4876-a94f-13adf3a4cdf8" + "ID": "a51646c9-c420-4a72-8ffc-8546955a1b0f" } ], "BreakpointIdentity": "13338930-7808-4004-9246-267ca97938f2" @@ -952,7 +956,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=客户管理!E4" + "SerializeProperty": "=客户管理!D4" }, "LeftBracket": 1 }, @@ -966,7 +970,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=客户管理!E4" + "SerializeProperty": "=客户管理!D4" }, "RightBracket": 1 } @@ -982,7 +986,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=客户管理!T6" + "SerializeProperty": "=客户管理!O6" } }, { @@ -994,7 +998,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=客户管理!E6" + "SerializeProperty": "=客户管理!D6" } } ] @@ -1173,7 +1177,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=客户管理!B11" + "SerializeProperty": "=客户管理!B12" }, "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "ResetTable", @@ -1184,7 +1188,7 @@ "BreakpointIdentity": "914649a0-9787-41ca-9006-61460c16345a" } ], - "ID": "808143d8-0be8-4e7c-89d9-48e57409374e" + "ID": "301e1407-b7bc-422e-9853-fec294a53859" } ], "BreakpointIdentity": "539d3d04-3cf0-4e2e-9285-4a975a32740a" @@ -1338,7 +1342,7 @@ "BreakpointIdentity": "4b6458bd-59d4-404a-99a6-a0ad6bf6ce56" } ], - "ID": "1ab7f2c0-f0fe-45d8-b6a4-47c904da87a8" + "ID": "07cef87d-c371-4862-b9de-9bdd6f22fd52" }, { "CommandList": [ @@ -1379,7 +1383,7 @@ "BreakpointIdentity": "60871ca7-b621-4ca4-baa0-592d512aed28" } ], - "ID": "3e0ba542-76ac-4c05-ad4b-e48077bfaaea" + "ID": "88f3e64d-026d-4698-8fbd-2046002d93e2" } ], "BreakpointIdentity": "824e9f0f-b653-47d9-9131-0131ad9b8183" @@ -1388,7 +1392,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=客户管理!B11" + "SerializeProperty": "=客户管理!B12" }, "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "ResetTable", @@ -1405,7 +1409,7 @@ "BreakpointIdentity": "211645c4-e546-4edb-8771-fdaa09561447" } ], - "ID": "77b81470-00f6-43bc-b462-7d62908e5593" + "ID": "ef18ca69-a62a-4bde-b67e-943775d301d1" } ], "BreakpointIdentity": "922ecdfa-0eac-4b86-9422-98f782ec3d38" @@ -1424,7 +1428,7 @@ "size": "default" } }, - "28,1": { + "29,1": { "CellType": { "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", "AttachElementTable": true, @@ -1472,7 +1476,7 @@ "hideOnSinglePage": true } }, - "30,1": { + "31,1": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "显示搜索栏", @@ -1484,7 +1488,7 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=客户管理!3:9" + "SerializeProperty": "=客户管理!4:11" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1501,7 +1505,7 @@ "StyleDatas": { "Styles": [ { - "BorderRight": 0 + "BorderLeft": 0 }, { "FontFamily": 1, @@ -1511,6 +1515,10 @@ { "FontFamily": 1 }, + { + "FontFamily": 1, + "BorderLeft": 0 + }, { "FontFamily": 1, "FontSize": 13.333333333333332 @@ -1523,12 +1531,9 @@ "FontSize": 13.333333333333332, "Formatter": 3 }, - { - "BorderBottom": 0 - }, { "FontSize": 13.333333333333332, - "BorderRight": 0 + "BorderLeft": 0 } ], "Types": { @@ -1545,20 +1550,27 @@ ] }, "CellStyles": { - "0,30": 0, + "0,31": 0, "1,1": 1, - "1,18": 2, - "1,30": 0, - "1,31": 2, - "2,27": 3, + "1,22": 2, + "1,31": 3, + "2,27": 4, "2,28": 2, "2,29": 2, - "2,30": 0, - "3,1": 4, - "3,4": 3, - "3,30": 0, - "4,1": 4, - "4,2": 4, + "2,31": 0, + "3,1": 5, + "3,3": 4, + "3,21": 2, + "3,22": 2, + "3,23": 2, + "3,24": 2, + "3,25": 2, + "3,26": 2, + "3,27": 2, + "3,28": 2, + "3,31": 0, + "4,1": 5, + "4,2": 5, "4,3": 4, "4,4": 4, "4,5": 4, @@ -1581,199 +1593,167 @@ "4,22": 4, "4,23": 4, "4,24": 4, - "4,25": 4, - "4,27": 3, - "4,28": 3, - "4,29": 3, - "4,30": 0, - "5,1": 3, - "5,3": 2, - "5,4": 3, - "5,15": 2, - "5,16": 5, - "5,17": 2, - "5,18": 2, - "5,19": 3, - "5,30": 0, - "6,1": 4, - "6,2": 4, - "6,3": 4, - "6,4": 4, - "6,5": 4, - "6,6": 4, - "6,7": 4, - "6,8": 4, - "6,9": 4, - "6,10": 4, - "6,11": 4, - "6,12": 4, - "6,13": 4, - "6,14": 4, - "6,15": 4, - "6,16": 4, - "6,17": 4, - "6,18": 4, - "6,19": 4, - "6,20": 4, - "6,21": 4, - "6,22": 4, - "6,23": 4, - "6,24": 4, - "6,25": 4, - "6,27": 3, - "6,28": 3, - "6,29": 3, - "6,30": 0, - "7,1": 3, + "4,25": 2, + "4,26": 4, + "4,27": 4, + "4,28": 4, + "4,31": 0, + "5,1": 4, + "5,3": 4, + "5,10": 2, + "5,11": 6, + "5,12": 2, + "5,13": 2, + "5,14": 4, + "5,21": 2, + "5,22": 2, + "5,23": 2, + "5,24": 2, + "5,31": 0, + "6,1": 5, + "6,2": 5, + "6,3": 5, + "6,4": 5, + "6,5": 5, + "6,6": 5, + "6,7": 5, + "6,8": 5, + "6,9": 5, + "6,10": 5, + "6,11": 5, + "6,12": 5, + "6,13": 5, + "6,14": 5, + "6,15": 5, + "6,16": 5, + "6,17": 5, + "6,18": 5, + "6,19": 5, + "6,20": 5, + "6,21": 5, + "6,22": 5, + "6,23": 5, + "6,24": 5, + "6,25": 5, + "6,27": 4, + "6,28": 4, + "6,29": 4, + "6,31": 0, "7,3": 2, - "7,4": 3, + "7,4": 2, "7,5": 2, - "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, - "7,21": 4, - "7,22": 4, - "7,23": 4, - "7,24": 4, - "7,25": 4, - "7,27": 3, - "7,28": 3, - "7,29": 3, - "7,30": 0, - "8,1": 6, - "8,2": 6, - "8,3": 6, - "8,4": 6, - "8,5": 6, - "8,6": 6, - "8,7": 6, - "8,8": 6, - "8,9": 6, - "8,10": 6, - "8,11": 6, - "8,12": 6, - "8,13": 6, - "8,14": 6, - "8,15": 6, - "8,16": 6, - "8,17": 6, - "8,18": 6, - "8,19": 6, - "8,20": 6, - "8,21": 6, - "8,22": 6, - "8,23": 6, - "8,24": 6, - "8,25": 6, - "8,26": 6, - "8,27": 6, - "8,28": 6, - "8,29": 6, - "8,30": 0, - "9,30": 0, - "10,30": 0, - "11,30": 0, - "12,30": 0, - "13,30": 0, - "14,30": 0, - "15,30": 0, - "16,30": 0, - "17,30": 0, - "18,30": 0, - "19,30": 0, - "20,30": 0, - "21,30": 0, - "22,30": 0, - "23,30": 0, - "24,30": 0, - "25,30": 0, - "26,30": 0, - "27,30": 0, - "27,31": 2, - "27,32": 2, - "27,33": 2, - "27,34": 2, - "27,35": 2, - "27,36": 2, - "27,37": 2, - "27,38": 2, - "27,39": 2, - "27,40": 2, - "28,1": 4, - "28,30": 0, - "29,1": 4, - "29,2": 4, - "29,3": 4, - "29,4": 4, - "29,5": 4, - "29,6": 4, - "29,7": 4, - "29,8": 4, - "29,9": 4, - "29,10": 4, - "29,11": 4, - "29,12": 4, - "29,13": 4, - "29,14": 4, - "29,15": 4, - "29,16": 4, - "29,17": 4, - "29,18": 4, - "29,19": 4, - "29,20": 4, - "29,21": 4, - "29,22": 4, - "29,23": 4, - "29,24": 4, - "29,25": 4, - "29,26": 4, - "29,27": 4, - "29,28": 4, - "29,29": 4, - "29,30": 7, - "29,31": 4, - "29,32": 4, - "29,33": 4, - "29,34": 4, - "29,35": 4, - "29,36": 4, - "29,37": 4, - "29,38": 4, - "29,39": 4, - "29,40": 4, - "30,30": 0 + "7,6": 2, + "7,7": 2, + "7,12": 5, + "7,13": 5, + "7,14": 5, + "7,15": 5, + "7,16": 5, + "7,17": 5, + "7,18": 5, + "7,19": 5, + "7,20": 5, + "7,21": 5, + "7,22": 5, + "7,23": 5, + "7,24": 5, + "7,25": 5, + "7,27": 4, + "7,28": 4, + "7,29": 4, + "7,31": 0, + "8,31": 0, + "9,31": 0, + "10,31": 0, + "11,31": 0, + "12,31": 0, + "13,31": 0, + "14,31": 0, + "15,31": 0, + "16,31": 0, + "17,31": 0, + "18,31": 0, + "19,31": 0, + "20,31": 0, + "21,31": 0, + "22,31": 0, + "23,31": 0, + "24,31": 0, + "25,31": 0, + "26,31": 0, + "27,31": 0, + "28,31": 3, + "28,32": 2, + "28,33": 2, + "28,34": 2, + "28,35": 2, + "28,36": 2, + "28,37": 2, + "28,38": 2, + "28,39": 2, + "28,40": 2, + "29,1": 5, + "29,31": 0, + "30,1": 5, + "30,2": 5, + "30,3": 5, + "30,4": 5, + "30,5": 5, + "30,6": 5, + "30,7": 5, + "30,8": 5, + "30,9": 5, + "30,10": 5, + "30,11": 5, + "30,12": 5, + "30,13": 5, + "30,14": 5, + "30,15": 5, + "30,16": 5, + "30,17": 5, + "30,18": 5, + "30,19": 5, + "30,20": 5, + "30,21": 5, + "30,22": 5, + "30,23": 5, + "30,24": 5, + "30,25": 5, + "30,26": 5, + "30,27": 5, + "30,28": 5, + "30,29": 5, + "30,30": 5, + "30,31": 7, + "30,32": 5, + "30,33": 5, + "30,34": 5, + "30,35": 5, + "30,36": 5, + "30,37": 5, + "30,38": 5, + "30,39": 5, + "30,40": 5, + "31,31": 0 }, "SheetStyle": { "FontFamily": 1 } }, "Spans": [ - "10,1,17,29", - "1,31,26,10", - "7,1,1,2", - "7,4,1,2", - "5,16,1,3", - "30,1,1,4", + "11,1,17,29", + "1,31,27,10", + "31,1,1,4", "3,1,1,2", "5,1,1,2", "2,27,1,3", - "1,18,1,12", - "5,19,1,10", - "28,1,1,29", - "3,4,1,26", - "5,4,1,11" + "29,1,1,29", + "5,3,1,7", + "5,11,1,3", + "5,14,1,7", + "3,3,1,18", + "1,22,1,8", + "7,3,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1808,6 +1788,18 @@ "PaperSize": {}, "Margin": {} }, + "BackgroundPictures": [ + { + "Name": "b0b52509-f6d8-4af7-92f1-5cee2060b8e3.png", + "DisplayName": "背景图1", + "StyleInfo": { + "Fill": "Background 2 0" + }, + "IsAutomaticFill": false, + "Location": "0,232", + "Size": "972,6" + } + ], "CustomNames": [ { "Name": "客户统计信息子页面", @@ -1815,7 +1807,7 @@ }, { "Name": "显示搜索栏", - "Formula": "客户管理!$B$31" + "Formula": "客户管理!$B$32" } ] -}//Cllrx7JjwMyFGFDLHMlYsQikPQpLE9qwVkaBr+ACwrSMVMN8zCRgMB8Er98b5bwTXLcJ0+ko8WkCo5u6tY3km1Ge5VQmf3OcW68TthIyU7QtCEOUt6wLhQMWwe7S2UKXhKAz2HD+6Ugl+XLarF3JJfOWMcNetC2cER6eZGpoV07sFkBvsbnswwWYSd3BbakevcXxT61l1KPySInnI6pb7Lp597G3TNgUi8tU7+NYgkh0VP00mJW2BgL4pbSgW59EBzjd+umZslzOsgiSPxizy9dcLTpRLE0ran6KIcEGbSwgDdnlUHvVffV6Wu7vITEsdQX8bC+uOoiFFguFcFUFIVEqrrtYJHc4ToCfQ/bKdt1bZBR6YmUcS8/YZ3MOXDMdwu2WRWGSqBXfxw4kpR4jzsChNtcgMyJ301sMDEvWQo/+6ZcSSiHLVMumaVr61T0mvwdEIx00HYAcFKYUgLjO/yOSRIi6ZVgQedQQQGudnHrLsE9SeIXzWvXfkA6TmSla4QV4Ds9fakIZY+gacGF/4ibNja3OVbLnS4G1utounu0At2oh4ewWZHhVS3yK9BxvpQXZAVoBcmKKHj7NrIWSUtYKYLw1oJyucd86lohqhwHvoMFXg4u/6JIbOAs2U5oH53UBSUmNh96MNw6GgJ/GyReGF6Ai8PSAx8GthueQCIOQeqJhGUpeg3VutnqcUgQ3W9F5z10rcwpSEW6Rf6V/bl/mlqEAysVcxCEmUQxVwlUxJrGreS8xwpv+U68saq6galfmyOxJX1hfhoI6Tkcv+wvSEqPLI84WYbvmzu7wUuhMJ+BEWXuz0dB1M1U5JFZVPNgVGrPLkg+sKXQZ0pD2s5DYtl91RSB9bvoB65csPQyIB6MrDmFbmG+DLulPupk26QoMGgh3vEYrz6hu8SJSKg==|920 \ No newline at end of file +}//q7klwe/nabxlh+4ienaVkC4T87N7cp+qwYb+0fgtlbU6xohrElXdJ42nGplV0Nb0p+E2vraunEGo1vFu2Rb7OF8ruq8phnwu55rHFbYL/iKWdQ/OoJJD+BCcoLLcSqw/Z9gC0TVuUo+jirRIdbYmN+AuBT6RgJDxl5GYZBi0M4dMWqZZ9i5E856Q6f8fiT1gmDr2U+gzTPbu+s1md0YFL2nKaDh/td040gFEzQeXzXMkWVLS/G0uKEiH3aJBXnSyfjP01S9p+YE3m+Q0ecWRlTveXdv+u+Qzj+Q4BQbnYLv+uqff9JTezFjKmYBkBCwcVEGave94m8bQ/is6HxYPQSXEkXtqo9oO+0ZGGktIzvWvvvJqfAtUdhOLl//ba7VAWxHrGLmBRLnQ/idjYIhE0CKD0jIvsmf9CJ3sXqQIMhAO+1F4smgbjWNQhk20VbFQpfgzO1nPKAY3UKgzxkjl8buFpnVAuXjqN2JL0EIyBMML6WoPWf314FOxOrCBBtf8NMTh6CL33BQXKcz5wnYY97UtlwYDObKgp6Za4bNcD0bwK8PVYwfFx78StnmWVOfws8Aa4ylFyLkU6CT3buMow9lb1h13A03WLy/LzYWVP4/buWWBFC+UZNrq7vXcVkDBPK2RCK5DnbHo4PLebRcNKzBvQEtT1J0rtm5JA3aCRvXaM/N7pnJXYRJz5/e6t9pewQhlaZvXF5d5QuviZZwotAeChE/BFivd6VyWRkjrXy1CR8W+0AFjrAqB3vVYIxyekIZakbiQkFNhMTZDEiBBgy9IFGUDQQ9dPJ7d/4BEzeQZ13J5ckzAY9pgRunHQFZTPOHyP/+y3AIVIKjaJZHXYaScOLP1dk5cgESFXJz9c2BY9FXtT5yHwSzm71qNZwKApAN3RB+3zBC8HsoTLwQ0jQ==|920 \ No newline at end of file diff --git a/Pages/客户/客户管理.rd b/Pages/客户/客户管理.rd index 80b45b9d..3ef040f9 100644 --- a/Pages/客户/客户管理.rd +++ b/Pages/客户/客户管理.rd @@ -1,7 +1,7 @@ { "PageType": 0, "ColumnCount": 42, - "RowCount": 31, + "RowCount": 32, "CustomNames": [ { "Name": "客户统计信息子页面", @@ -9,7 +9,7 @@ }, { "Name": "显示搜索栏", - "Formula": "客户管理!$B$31" + "Formula": "客户管理!$B$32" } ] } \ No newline at end of file diff --git a/Pages/财务/付款凭证管理.json b/Pages/财务/付款凭证管理.json index 1321e2a7..aa7a0cc2 100644 --- a/Pages/财务/付款凭证管理.json +++ b/Pages/财务/付款凭证管理.json @@ -13,32 +13,52 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 10.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 28.0 + "DesignLengthInPixel": 35.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 20.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 30.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 634.0, + "DesignLengthInPixel": 24.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 6.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 505.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -48,26 +68,30 @@ } } }, - "9": { + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } }, - "10": { + "13": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, "InLogicalVisibleIndexes": [ - 2, 3, 4, 5, - 10 + 6, + 7, + 8, + 9, + 10, + 13 ], - "Count": 11, - "DefaultSize": 32.0 + "Count": 14, + "DefaultSize": 24.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -183,12 +207,14 @@ }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "23": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "24": { @@ -243,33 +269,30 @@ }, "34": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "35": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, - "Count": 36, + "Count": 37, "DefaultSize": 32.0 }, "Values": { "1,1": "%PageTitle%", - "3,1": "日期", - "5,1": "查询", - "5,4": "重置" + "3,1": "关键字", + "5,1": "日期" }, "AttachInfos": { - "1,19": { + "1,26": { "CssName": "toolbar toolbar-right ", "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", @@ -368,6 +391,40 @@ } }, "3,3": { + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "suffixIcon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "Application/047_search_8.svg", + "BuiltIn": true, + "Color": "#c0c4cc" + }, + "resize": "none" + } + }, + "5,3": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", "CommandList": [ @@ -375,7 +432,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=付款凭证管理!D4" + "SerializeProperty": "=付款凭证管理!D6" }, "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "GetSelectedRange", @@ -419,21 +476,36 @@ "DefautWeekFormat": "yyyy 第 WW 周" } }, - "5,1": { + "7,3": { "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "Text": "查询", - "TemplateKey": "_RS_Main1" + "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", + "UserControlPageName": "重置查询按钮", + "CommandHandlers": [ + { + "CommandName": "次按钮单击", + "Commands": { + "Commands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=付款凭证管理!D4,付款凭证管理!D6" + }, + "Value": "%Null%" + } + ], + "BreakpointIdentity": "5c88f11f-702b-4cb2-82a9-a17bc13ccae3" + } + ], + "ParamProperties": {} + } + } + ] } }, - "5,4": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "Text": "重置", - "TemplateKey": "_RS_Information3" - } - }, - "8,1": { + "11,1": { "CellType": { "$type": "ElementUI.TableCellType, ElementUI", "ElTableName": "EL表格1", @@ -601,253 +673,190 @@ { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "ID", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "ID", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "resizable": false, - "showOverflowTooltip": false, "hide": true, - "key": "1c739f82-0525-4eef-802a-ef9aecba3559", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "resizable": false, + "key": "1c739f82-0525-4eef-802a-ef9aecba3559" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "付款日期", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "付款日期", - "formatStr": "yyyy年MM月dd日", "width": 150, - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "key": "0e2215cf-e59e-48a5-9c31-183a72e3eea5", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "formatString": "yyyy年MM月dd日", + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "0e2215cf-e59e-48a5-9c31-183a72e3eea5" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "经手人_全名", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "经手人", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "key": "e0678c8d-41af-4c1e-b1b2-451e79571ef9", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "e0678c8d-41af-4c1e-b1b2-451e79571ef9" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "付款金额", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "付款金额", - "formatStr": "¥#,##0.00_)", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "key": "9e30cc77-052f-4412-9a0e-26c31a20512d", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "formatString": "¥#,##0.00_)", + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "9e30cc77-052f-4412-9a0e-26c31a20512d" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "付款科目", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "付款科目", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "key": "b75c2d53-4a28-49b3-898e-37496a33309e", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "b75c2d53-4a28-49b3-898e-37496a33309e" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "收款人", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "收款人", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "key": "9eeb4dbb-a043-4abd-b730-7eccf97a0d85", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "9eeb4dbb-a043-4abd-b730-7eccf97a0d85" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "户名", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "户名", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "key": "c40280e3-31fe-4d27-952d-a77fef90a8e5", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "c40280e3-31fe-4d27-952d-a77fef90a8e5" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "卡号", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "卡号", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "key": "846003de-c170-41e1-8068-197790f08470", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "846003de-c170-41e1-8068-197790f08470" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "开户行", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "开户行", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "key": "1e18d4ea-906b-44aa-9eef-e29b2cae4c0d", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "1e18d4ea-906b-44aa-9eef-e29b2cae4c0d" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "备注", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "备注", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "key": "efbf35a1-18b9-48ab-a316-35d82a645f69", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "efbf35a1-18b9-48ab-a316-35d82a645f69" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "当前节点", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "当前节点", - "align": "center", - "headerAlign": "center", "colfixed": "right", - "type": "Tag", - "tagType": "info", - "imgType": "cover", - "key": "6523066c-b27a-44a8-a2af-4a1fbf7829f1", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "6523066c-b27a-44a8-a2af-4a1fbf7829f1" } ], "showActionButtons": true, "actionButtons": [ { "$type": "ElementUI.ActionButton, ElementUI", - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], "type": "button", "Name": "查看", "shape": "default", @@ -880,7 +889,10 @@ "ParamProperties": { "dataRow": "行数据" } - } + }, + "allowRoles": [ + "FGC_Anonymous" + ] } ], "operationColumnWidth": 100, @@ -888,7 +900,7 @@ "size": "default" } }, - "10,9": { + "13,9": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "显示搜索栏", @@ -900,7 +912,7 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=付款凭证管理!3:6" + "SerializeProperty": "=付款凭证管理!4:11" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -931,199 +943,213 @@ { "FontFamily": 0, "FontSize": 13.333333333333332 - }, - { - "FontFamily": 0, - "BorderBottom": 0 } ], "Types": { "Strs": [ "Body", - "[AUTO]General", - "Background 2 0" - ], - "Borders": [ - { - "Color": 2 - } + "[AUTO]General" ] }, "CellStyles": { "1,1": 0, - "1,19": 1, - "1,20": 1, - "1,21": 1, - "1,22": 1, - "1,23": 1, - "1,24": 1, - "1,25": 1, "1,26": 1, - "1,27": 1, - "1,28": 1, - "1,29": 1, - "1,30": 1, - "1,31": 1, - "1,32": 1, - "1,33": 1, - "1,34": 1, "3,1": 2, "3,2": 1, - "3,3": 3, - "3,4": 1, - "3,5": 1, - "3,6": 1, - "3,7": 1, - "3,8": 1, - "3,9": 1, - "3,10": 1, - "3,11": 1, - "3,12": 1, - "3,13": 1, - "3,14": 1, - "3,15": 1, - "3,16": 1, - "3,17": 1, - "3,18": 1, - "4,1": 3, - "4,2": 3, - "4,3": 3, - "4,4": 3, - "4,5": 3, - "4,6": 3, - "4,7": 3, - "4,8": 3, - "4,9": 3, - "4,10": 3, - "4,11": 3, - "4,12": 3, - "4,13": 3, - "4,14": 3, - "4,15": 3, - "4,16": 3, - "4,17": 3, - "4,18": 3, - "4,19": 3, - "4,20": 3, - "4,21": 3, - "4,22": 3, - "4,23": 3, - "4,24": 3, - "4,25": 1, - "4,26": 3, - "4,27": 3, - "4,28": 3, - "4,29": 3, - "5,1": 3, + "5,1": 2, "5,2": 1, - "5,3": 1, - "5,4": 3, + "5,3": 3, + "5,4": 1, "5,5": 1, - "5,6": 3, - "5,7": 3, - "5,8": 3, - "5,9": 3, - "5,10": 3, - "5,11": 3, - "5,12": 3, - "5,13": 3, - "5,14": 3, - "5,15": 3, - "5,16": 3, - "5,17": 3, - "5,18": 3, - "5,19": 3, - "5,20": 3, - "5,21": 3, - "5,22": 3, - "5,23": 3, - "5,24": 3, - "5,25": 1, - "5,26": 3, - "5,27": 3, - "5,28": 3, - "5,29": 3, - "6,1": 4, - "6,2": 4, - "6,3": 4, - "6,4": 4, - "6,5": 4, - "6,6": 4, - "6,7": 4, - "6,8": 4, - "6,9": 4, - "6,10": 4, - "6,11": 4, - "6,12": 4, - "6,13": 4, - "6,14": 4, - "6,15": 4, - "6,16": 4, - "6,17": 4, - "6,18": 4, - "6,19": 4, - "6,20": 4, - "6,21": 4, - "6,22": 4, - "6,23": 4, - "6,24": 4, - "6,25": 4, - "6,26": 4, - "6,27": 4, - "6,28": 4, - "6,29": 4, - "6,30": 4, - "6,31": 4, - "6,32": 4, - "6,33": 4, - "7,1": 1, - "7,2": 1, + "5,6": 1, + "5,7": 1, + "5,8": 1, + "5,9": 1, + "5,10": 1, + "5,11": 1, + "5,12": 1, + "5,13": 1, + "5,14": 1, + "5,15": 1, + "5,16": 1, + "5,17": 1, + "5,18": 1, + "6,1": 3, + "6,2": 3, + "6,3": 3, + "6,4": 3, + "6,5": 3, + "6,6": 3, + "6,7": 3, + "6,8": 3, + "6,9": 3, + "6,10": 3, + "6,11": 3, + "6,12": 3, + "6,13": 3, + "6,14": 3, + "6,15": 3, + "6,16": 3, + "6,17": 3, + "6,18": 3, + "6,19": 3, + "6,20": 3, + "6,21": 3, + "6,22": 3, + "6,23": 3, + "6,24": 3, + "6,25": 3, + "6,26": 1, + "6,27": 3, + "6,28": 3, + "6,29": 3, + "6,30": 3, "7,3": 1, "7,4": 1, "7,5": 1, "7,6": 1, "7,7": 1, - "7,8": 1, - "7,9": 1, - "7,10": 1, - "7,11": 1, - "7,12": 1, - "7,13": 1, - "7,14": 1, - "7,15": 1, - "7,16": 1, - "7,17": 1, - "7,18": 1, - "7,19": 1, - "7,20": 1, - "7,21": 1, - "7,22": 1, - "7,23": 1, - "7,24": 1, - "7,25": 1, + "7,8": 3, + "7,9": 3, + "7,10": 3, + "7,11": 3, + "7,12": 3, + "7,13": 3, + "7,14": 3, + "7,15": 3, + "7,16": 3, + "7,17": 3, + "7,18": 3, + "7,19": 3, + "7,20": 3, + "7,21": 3, + "7,22": 3, + "7,23": 3, + "7,24": 3, + "7,25": 3, "7,26": 1, - "7,27": 1, - "7,28": 1, - "7,29": 1, - "7,30": 1, - "7,31": 1, - "7,32": 1, - "7,33": 1 + "7,27": 3, + "7,28": 3, + "7,29": 3, + "7,30": 3, + "8,1": 1, + "8,2": 1, + "8,3": 1, + "8,4": 1, + "8,5": 1, + "8,6": 1, + "8,7": 1, + "8,8": 1, + "8,9": 1, + "8,10": 1, + "8,11": 1, + "8,12": 1, + "8,13": 1, + "8,14": 1, + "8,15": 1, + "8,16": 1, + "8,17": 1, + "8,18": 1, + "8,19": 1, + "8,20": 1, + "8,21": 1, + "8,22": 1, + "8,23": 1, + "8,24": 1, + "8,25": 1, + "8,26": 1, + "8,27": 1, + "8,28": 1, + "8,29": 1, + "8,30": 1, + "8,31": 1, + "8,32": 1, + "8,33": 1, + "8,34": 1, + "9,1": 1, + "9,2": 1, + "9,3": 1, + "9,4": 1, + "9,5": 1, + "9,6": 1, + "9,7": 1, + "9,8": 1, + "9,9": 1, + "9,10": 1, + "9,11": 1, + "9,12": 1, + "9,13": 1, + "9,14": 1, + "9,15": 1, + "9,16": 1, + "9,17": 1, + "9,18": 1, + "9,19": 1, + "9,20": 1, + "9,21": 1, + "9,22": 1, + "9,23": 1, + "9,24": 1, + "9,25": 1, + "9,26": 1, + "9,27": 1, + "9,28": 1, + "9,29": 1, + "9,30": 1, + "9,31": 1, + "9,32": 1, + "9,33": 1, + "9,34": 1, + "10,1": 1, + "10,2": 1, + "10,3": 1, + "10,4": 1, + "10,5": 1, + "10,6": 1, + "10,7": 1, + "10,8": 1, + "10,9": 1, + "10,10": 1, + "10,11": 1, + "10,12": 1, + "10,13": 1, + "10,14": 1, + "10,15": 1, + "10,16": 1, + "10,17": 1, + "10,18": 1, + "10,19": 1, + "10,20": 1, + "10,21": 1, + "10,22": 1, + "10,23": 1, + "10,24": 1, + "10,25": 1, + "10,26": 1, + "10,27": 1, + "10,28": 1, + "10,29": 1, + "10,30": 1, + "10,31": 1, + "10,32": 1, + "10,33": 1, + "10,34": 1 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ + "13,1,1,4", + "13,5,1,4", + "11,1,1,35", "5,1,1,2", - "5,4,1,2", - "10,1,1,4", - "10,5,1,4", - "8,1,1,34", + "5,3,1,16", + "13,9,1,4", + "1,26,1,10", + "7,3,1,5", "3,1,1,2", - "3,3,1,16", - "1,19,1,16", - "10,9,1,4" + "3,3,1,16" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1158,18 +1184,31 @@ "PaperSize": {}, "Margin": {} }, + "BackgroundPictures": [ + { + "FitToBrowserWidth": true, + "Name": "70f473a5-c542-414e-b7e2-b3f364bd15a0.png", + "DisplayName": "背景图1", + "StyleInfo": { + "Fill": "Background 2 0" + }, + "IsAutomaticFill": false, + "Location": "0,242", + "Size": "1184,6" + } + ], "CustomNames": [ { "Name": "开始日期", - "Formula": "付款凭证管理!$B$11" + "Formula": "付款凭证管理!$B$14" }, { "Name": "结束日期", - "Formula": "付款凭证管理!$F$11" + "Formula": "付款凭证管理!$F$14" }, { "Name": "显示搜索栏", - "Formula": "付款凭证管理!$J$11" + "Formula": "付款凭证管理!$J$14" } ] -}//+WLUyC32ENIIFdYV6RVN3+kW91noh3FdMdY6PLKQnML2jd8yUeWBMYIYYbywjvfWERai8Em/Q2DMbILdXH7kJicU/pDK5kMbLPh0l1rc9vdvhsL+iwzfCeh8vnTAcc0x2xOS4oumBSd7KzrWJgNH1tw57tpvERo1R0lsHmzls479GPKjCj9jRegyDcfNcWQdrIV0zKoojiDXxox8dm5dMM6KjnJNa2OC6usbG7/pg5wP4z//bQIYVnKQ4syEpI9CdRfXRgxeHkJtuw14NXoo5YQylHEnYga2iXxxBPBBolsnjy/yTjmPyfXm31c/11tPC5aHApZAl6uwcmYHhJRyp520glOJ1+19ujovL+1mg1K+YlS1wrOfqsTuHa7fH5wLl6zdJzQNNTpsgD9MnuHR7OvGciWwRh5XjP06bMoFYJf0QgGuLTmg8r9WL5pN20GQTxk4iydHcB+GKvKFj8X7t2L+/jKa+/j9ST3joQiYF7Rz7yZZWTnOpnvVKfdGGPD4W77mXm6xEIyONFWPyn7IwGjyLxy3aTnFAv6/Q8tl4sNG7Aw8kghSGWY3b1YYNv0JXIDWHoeD36nHrBbnmjUNIElID3/CGEZZy+xjEFy1IUzt8ifZGFiGQriZjii3AdxMDSDWrUiwEBPsIXOd0u3dD5suMj1Z05AvwTjNHqWYX/aok2YYFIDE6Tpp82Ka6iSOZ6p7B1s23JP+RgiY1ZwsCQ6384CWXDjd8WMt84Uu/qw009+GeAChsRHOoroZi4FWjFhhcQbOoKE7A1tBDAiwdGi7Kc7yIkDNWmFUUFsqcLH+fkM3/Yf7vq08tUdMpN1ZegyYaJsyifGNAH/NsxzxjM0JUnR4bkU3GKF0o7k/iy07nEPXfTbye72YyBk2CPmkLUQ8Z9hP+pTSDlQhF8eJqQ==|920 \ No newline at end of file +}//RCXIL650+BMnhha860oteZBdTs8piEr66UDeiWo3ub0IEP6A8iAUKpeQs+v27KUFLIgzknAikI7yb1ufrCxcnoZ4MelE7rOSXhKqZdHHiAc6M2txHKHpkeOJ8mKk1Uh9Nsl5qechwT8rWozSDrI64CtDD44Xy5cpztXei1l2g1h3MUD9YLTXvIu5CDYHw7k2oZ8z4kvAUz9hRDGx/axKJk5lY8blLurve3c8TNT/3zn6EW2yVbiHJk39Wm/nEzX4nY5Ev9LW6+VCMUAwEqbLayDfcMgjz+RGGAMRd4GcBuVUFqpM6KsJBZWSm3jJy30x1XWmRsyCC/xA3ThXjvviOKjlIXRpB4S7WscrLZq/Z4K6C4uHbxw3OuBvFu2wl7RlNg+e74owB0PPhcxhsuv7/MyeiGMcVbcsVra6fiYJhPe+dflbbcit2QXx0B4eriSHjmVoBWIkRQIgjDaj/y48Nv4JtkU7+zpmOE9OQQVycDw9CPXf5SmdVIwEdDYJxLJ/0zqUqojOuYacgqRQFvQ/H7fWc/zV0uaugbtPklzWELUTgIfTB1R03kyfQpmds8bNf6ElJiYcgSd0BBDOo11SKxkOLzPs0G9K2XlLFe2LyjammyVCtJK1liH2PaSaMgFMLdrchcjI+h0FE44tzLCE4DsjPBWfWCWxSdC1BYKU5OdRnyo7J6UwvW4Ke195KdBM7BO91OnqaNUYgEB6SqmYOxJf4Bk+TTBEFer62Y8ImD6KPdQbDU3mu0yR/vsv1G8rvcwkbcKW4cJgS90LzjnxRqXjmCHsT2opPtsUxGoMtlkHomzstyxYXldU87EhcRdKR5+a7pYv8PzVAgErJi681LqwiK2egW4/TRpy7HeoS4CNVFeSLGjjpmIpGTNwlAbucC/hfHxVblCQs9F+aV7ofA==|920 \ No newline at end of file diff --git a/Pages/财务/付款凭证管理.rd b/Pages/财务/付款凭证管理.rd index e2623126..c67354a7 100644 --- a/Pages/财务/付款凭证管理.rd +++ b/Pages/财务/付款凭证管理.rd @@ -1,19 +1,19 @@ { "PageType": 0, - "ColumnCount": 36, - "RowCount": 11, + "ColumnCount": 37, + "RowCount": 14, "CustomNames": [ { "Name": "开始日期", - "Formula": "付款凭证管理!$B$11" + "Formula": "付款凭证管理!$B$14" }, { "Name": "结束日期", - "Formula": "付款凭证管理!$F$11" + "Formula": "付款凭证管理!$F$14" }, { "Name": "显示搜索栏", - "Formula": "付款凭证管理!$J$11" + "Formula": "付款凭证管理!$J$14" } ] } \ No newline at end of file diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index f6ef9e9a..db7042cb 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -43,25 +43,30 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 6.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 24.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 30.0 } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 34.0 + "DesignLengthInPixel": 10.0 } }, "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 34.0 + } + }, + "14": { "GridRowColumnDefinition": { "DesignLengthInPixel": 379.0, "Mode": 2, @@ -73,42 +78,44 @@ } } }, - "14": { + "15": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } }, - "15": { + "16": { "GridRowColumnDefinition": { "DesignLengthInPixel": 30.0 } }, - "16": { + "17": { "GridRowColumnDefinition": { "DesignLengthInPixel": 12.0 } }, - "17": { + "18": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } }, - "18": { + "19": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, "InLogicalVisibleIndexes": [ - 2, 3, 4, 5, 6, 7, - 18 + 8, + 9, + 10, + 19 ], - "Count": 19, + "Count": 20, "DefaultSize": 24.0 }, "Cols": { @@ -130,7 +137,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "4": { @@ -255,7 +262,14 @@ }, "29": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "30": { @@ -315,14 +329,7 @@ }, "41": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 12.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "42": { @@ -336,23 +343,21 @@ }, "Values": { "1,1": "%PageTitle%", - "3,1": "类型", - "3,4": 0, - "3,13": "状态", - "3,22": "项目经理", - "3,32": "所属客户", - "5,1": "关键字", - "7,1": "查询", - "7,4": "重置", - "10,1": "项目分组", - "10,11": "项目列表", - "15,1": "添加分组" + "3,1": "关键字", + "3,20": "类型", + "3,22": 0, + "5,1": "状态", + "5,10": "项目经理", + "5,20": "所属客户", + "11,1": "项目分组", + "11,11": "项目列表", + "16,1": "添加分组" }, "Formulas": { - "10,11": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" + "11,11": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" }, "AttachInfos": { - "1,31": { + "1,35": { "CssName": "toolbar toolbar-right ", "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", @@ -416,14 +421,8 @@ "width": "280px", "distance": "10px", "borderRadius": "5px", - "ID": { - "type": "formula", - "obj": "NotiflixNotify" - }, - "className": { - "type": "formula", - "obj": "notiflix-notify" - }, + "ID": "NotiflixNotify", + "className": "notiflix-notify", "fontFamily": "Quicksand", "fontSize": "13px", "fontAwesomeIconSize": "34px", @@ -460,18 +459,12 @@ "type": "color", "value": "#fff" }, - "fontAwesomeClassName": { - "type": "formula", - "obj": "fas fa-check-circle" - }, + "fontAwesomeClassName": "fas fa-check-circle", "fontAwesomeIconColor": { "type": "color", "value": "rgba(0,0,0,0.2)" }, - "childClassName": { - "type": "formula", - "obj": "notiflix-notify-success" - } + "childClassName": "notiflix-notify-success" }, "failure": { "UseFontAwesome": true, @@ -491,18 +484,12 @@ "type": "color", "value": "#fff" }, - "fontAwesomeClassName": { - "type": "formula", - "obj": "fas fa-times-circle" - }, + "fontAwesomeClassName": "fas fa-times-circle", "fontAwesomeIconColor": { "type": "color", "value": "rgba(0,0,0,0.2)" }, - "childClassName": { - "type": "formula", - "obj": "notiflix-notify-failure" - } + "childClassName": "notiflix-notify-failure" }, "warning": { "UseFontAwesome": true, @@ -522,18 +509,12 @@ "type": "color", "value": "#fff" }, - "fontAwesomeClassName": { - "type": "formula", - "obj": "fas fa-exclamation-circle" - }, + "fontAwesomeClassName": "fas fa-exclamation-circle", "fontAwesomeIconColor": { "type": "color", "value": "rgba(0,0,0,0.2)" }, - "childClassName": { - "type": "formula", - "obj": "notiflix-notify-warning" - } + "childClassName": "notiflix-notify-warning" }, "info": { "UseFontAwesome": true, @@ -553,18 +534,12 @@ "type": "color", "value": "#fff" }, - "fontAwesomeClassName": { - "type": "formula", - "obj": "fas fa-info-circle" - }, + "fontAwesomeClassName": "fas fa-info-circle", "fontAwesomeIconColor": { "type": "color", "value": "rgba(0,0,0,0.2)" }, - "childClassName": { - "type": "formula", - "obj": "notiflix-notify-info" - } + "childClassName": "notiflix-notify-info" } }, "BreakpointIdentity": "4cf70afb-4521-4a5e-a8c3-82878b131dc2" @@ -581,14 +556,8 @@ "width": "280px", "distance": "10px", "borderRadius": "5px", - "ID": { - "type": "formula", - "obj": "NotiflixNotify" - }, - "className": { - "type": "formula", - "obj": "notiflix-notify" - }, + "ID": "NotiflixNotify", + "className": "notiflix-notify", "fontFamily": "Quicksand", "fontSize": "13px", "fontAwesomeIconSize": "34px", @@ -625,18 +594,12 @@ "type": "color", "value": "#fff" }, - "fontAwesomeClassName": { - "type": "formula", - "obj": "fas fa-check-circle" - }, + "fontAwesomeClassName": "fas fa-check-circle", "fontAwesomeIconColor": { "type": "color", "value": "rgba(0,0,0,0.2)" }, - "childClassName": { - "type": "formula", - "obj": "notiflix-notify-success" - } + "childClassName": "notiflix-notify-success" }, "failure": { "UseFontAwesome": true, @@ -656,18 +619,12 @@ "type": "color", "value": "#fff" }, - "fontAwesomeClassName": { - "type": "formula", - "obj": "fas fa-times-circle" - }, + "fontAwesomeClassName": "fas fa-times-circle", "fontAwesomeIconColor": { "type": "color", "value": "rgba(0,0,0,0.2)" }, - "childClassName": { - "type": "formula", - "obj": "notiflix-notify-failure" - } + "childClassName": "notiflix-notify-failure" }, "warning": { "UseFontAwesome": true, @@ -687,18 +644,12 @@ "type": "color", "value": "#fff" }, - "fontAwesomeClassName": { - "type": "formula", - "obj": "fas fa-exclamation-circle" - }, + "fontAwesomeClassName": "fas fa-exclamation-circle", "fontAwesomeIconColor": { "type": "color", "value": "rgba(0,0,0,0.2)" }, - "childClassName": { - "type": "formula", - "obj": "notiflix-notify-warning" - } + "childClassName": "notiflix-notify-warning" }, "info": { "UseFontAwesome": true, @@ -718,18 +669,12 @@ "type": "color", "value": "#fff" }, - "fontAwesomeClassName": { - "type": "formula", - "obj": "fas fa-info-circle" - }, + "fontAwesomeClassName": "fas fa-info-circle", "fontAwesomeIconColor": { "type": "color", "value": "rgba(0,0,0,0.2)" }, - "childClassName": { - "type": "formula", - "obj": "notiflix-notify-info" - } + "childClassName": "notiflix-notify-info" } }, "BreakpointIdentity": "d340c202-7122-41f9-ba46-334b8581315f" @@ -886,7 +831,7 @@ "BreakpointIdentity": "49c0ba5e-ef6e-449b-a95b-3a9d9aebfbbf" } ], - "ID": "ccaaf543-6cc3-4ae2-814a-b6548442266f" + "ID": "25e73ff8-e3bb-40ed-b6f7-dd92d2ad25cc" }, { "CommandList": [ @@ -899,13 +844,13 @@ "BreakpointIdentity": "eb3eaa86-61fb-4843-887f-e4c861a4205c" } ], - "ID": "8fbba175-871a-4fb5-ab2c-1927855e9a91" + "ID": "4594665b-c1a8-4e55-90e7-bc85a599ea70" } ], "BreakpointIdentity": "fa030b70-9d76-44fb-8878-e3068e011037" } ], - "ID": "6138e49e-2e20-4001-8c96-17ab7903cd41" + "ID": "cd2e4d82-46f1-4d52-9c7e-e4eeb344c959" } ], "BreakpointIdentity": "6b112335-8337-4674-895c-a5a1a0113abd" @@ -941,7 +886,7 @@ "BreakpointIdentity": "1497778d-bdb5-4314-9688-27dc42e2ed79" } ], - "ID": "0691cad1-2690-4d23-aefe-388d001d324c" + "ID": "845653b8-5a84-4728-9595-0f9d987271ff" } ], "BreakpointIdentity": "f1969dc7-3133-4cc1-acb0-436e6cc77194" @@ -964,7 +909,37 @@ ] } }, - "3,4": { + "3,3": { + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "placeholder": "请输入关键词搜索", + "resize": "none", + "clearable": true + } + }, + "3,22": { "CssName": "singlebox", "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", @@ -982,7 +957,7 @@ ] } }, - "3,15": { + "5,3": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -1061,7 +1036,7 @@ "clearable": true } }, - "3,24": { + "5,12": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -1140,7 +1115,7 @@ "clearable": true } }, - "3,34": { + "5,22": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -1219,182 +1194,158 @@ "clearable": true } }, - "5,4": { + "7,3": { "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ + "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", + "UserControlPageName": "重置查询按钮", + "CommandHandlers": [ { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] + "CommandName": "次按钮单击", + "Commands": { + "Commands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!W4,项目列表!D6,项目列表!M6,项目列表!W6,项目列表!D4,项目列表!选中分组" + }, + "Value": "%Null%" + } + ], + "BreakpointIdentity": "6eb3437c-4477-46a9-b098-0021e7d6bfa7" + } + ], + "ParamProperties": {} + } }, { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "text", - "placeholder": "请输入关键词搜索", - "resize": "none", - "clearable": true - } - }, - "7,1": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ + "CommandName": "主按钮单击", + "Commands": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目列表!W4" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否删除", + "ParameterValue": "0", + "ID": "585d47d572514c279377f0a8bf3b2e8a", + "BreakpointIdentity": "a12df77c-b855-40c4-8eeb-2b847e7a31a5" + } + ], + "ID": "7f009989-949d-4783-9f9d-8c8129fd4f9c" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否删除", + "ParameterValue": "1", + "ID": "c347b95e417c4b3286e62c9ce612c26d", + "BreakpointIdentity": "3617c0c1-7cc7-439e-af71-18f99f1b067a" + } + ], + "ID": "1355e6ed-cb0a-4fbc-8887-83d14c5055e2" + } + ], + "BreakpointIdentity": "7cbd3d06-12ae-44ed-b879-b99ae8536a7c" + }, + { + "$type": "Forguncy.Model.QueryCommand, ServerDesignerCommon", + "TargetTableName": "项目平行视图", + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ { - "SerializeProperty": "=项目列表!E4" + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "项目状态", + "GUID": "d0c9255e-23c8-42b3-b59a-700968e5752b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!J6" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "项目经理", + "GUID": "0b683da9-5dae-4807-8bc3-d215694b4626" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!S6" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "所属客户", + "GUID": "85d67675-4493-46e1-9def-5e7cc44c3c00" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!AC6" + } + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "项目名称", + "GUID": "bc5a658c-2e07-40f7-9e1d-b8858465643e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!J4" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "删除", + "GUID": "9eee1fb5-c594-4a1d-9ff7-707a23f1b39a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!是否删除" + } } ] }, - "value": "0" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "是否删除", - "ParameterValue": "0", - "ID": "f80245fe95e54190b6fd428917237293", - "BreakpointIdentity": "0c25b346-4031-4943-8822-0aaa4132ab56" - } - ], - "ID": "b422716f-9aa9-4393-8e15-1cef640415cf" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "是否删除", - "ParameterValue": "1", - "ID": "f1f46d09366c4d40878ac41cc03c7045", - "BreakpointIdentity": "c7ed3242-109c-4c3d-bfce-6cf6f062b845" - } - ], - "ID": "71aa3b1e-c0e7-4cf5-9fb4-7bc156102e73" - } - ], - "BreakpointIdentity": "9cc6ad9e-8e1e-4585-9daf-8f4716cd0931" - }, - { - "$type": "Forguncy.Model.QueryCommand, ServerDesignerCommon", - "TargetTableName": "项目平行视图", - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目平行视图", - "ColumnName": "项目状态", - "GUID": "d5f26a3f-9728-459f-9fff-c6e2b9e6f9b4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!P4" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目平行视图", - "ColumnName": "项目经理", - "GUID": "c1097450-7da9-4ece-ae2d-8d203147450b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!Y4" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目平行视图", - "ColumnName": "所属客户", - "GUID": "65f328c3-ae67-45e0-b364-ffc48aa47ff2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!AI4" - } - }, - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 6, - "ColumnBindingInfo": { - "TableName": "项目平行视图", - "ColumnName": "项目名称", - "GUID": "63e2b325-3272-48af-8efb-2097dc8339bb" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!E6" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目平行视图", - "ColumnName": "删除", - "GUID": "72ec8346-7983-45df-84bf-c5789beb7ec8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!是否删除" - } + "ID": "e424648a822349f8ad39e85c0944f5df", + "BreakpointIdentity": "a8bf2ac8-0b46-47ac-83e7-8053138fbf19" } - ] - }, - "ID": "4d6f24be6ed34d05a6d27c0b190d8b5a", - "BreakpointIdentity": "4b3b2e39-4728-4d20-8e96-5440a18559d1" + ], + "ParamProperties": {} + } } - ], - "Text": "查询", - "TemplateKey": "_RS_Main1" + ] } }, - "7,4": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!E4,项目列表!P4,项目列表!Y4,项目列表!AI4,项目列表!E6,项目列表!选中分组" - }, - "Value": "%Null%" - } - ], - "BreakpointIdentity": "26225d86-9b4c-405a-a0b7-0ad6597d4868" - } - ], - "Text": "重置", - "TemplateKey": "_RS_Information3" - } - }, - "10,7": { + "11,7": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1422,7 +1373,7 @@ "3db70195-fce8-4da3-b3e5-e56009ee399a" ] }, - "10,10": { + "11,10": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1451,7 +1402,7 @@ "UseCellForeColor": true } }, - "12,1": { + "13,1": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "8ee6eff0b74d43ef8e54cd3ef782f76", @@ -1541,7 +1492,7 @@ "TemplateKey": "悬浮变灰" } }, - "12,10": { + "13,10": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "b90932e038f94707b54e571ff7cd84d", @@ -1588,7 +1539,7 @@ "BreakpointIdentity": "57519858-b323-4de9-9d2c-728d6e452e2e" } ], - "ID": "f441aad4-a787-4ca1-aeae-a4d58344929f" + "ID": "0ee0583e-22e7-4f2b-ae46-4b730a5267cc" }, { "CommandList": [ @@ -1602,7 +1553,7 @@ "BreakpointIdentity": "7fc45575-b525-405a-801f-42a0dfefda35" } ], - "ID": "d003a79a-3096-4e16-bc70-c96d2af03b67" + "ID": "81c06db8-4983-44bb-9d1c-fd8ec01cda54" } ], "BreakpointIdentity": "68d63b0c-a862-4801-b1bc-258944795477" @@ -1756,7 +1707,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!E4" + "SerializeProperty": "=项目列表!W4" } }, { @@ -1803,7 +1754,7 @@ "TemplateKey": "竖排横线分割" } }, - "15,1": { + "16,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -1824,7 +1775,7 @@ "IconSize": 14.0 } }, - "18,10": { + "19,10": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "显示搜索栏", @@ -1836,7 +1787,7 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!3:8" + "SerializeProperty": "=项目列表!4:11" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1866,47 +1817,29 @@ { "FontFamily": 1, "FontSize": 13.333333333333332, - "Formatter": 2 + "Foreground": 2 }, { "FontFamily": 1, "FontSize": 13.333333333333332, - "Foreground": 3 + "Formatter": 3 + }, + { + "HorizontalAlignment": 4 }, { "FontFamily": 1, "FontSize": 13.333333333333332, - "BorderBottom": 0 - }, - { - "FontFamily": 1, - "BorderBottom": 0 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Foreground": 3, - "BorderBottom": 0 - }, - { - "BorderBottom": 0 + "Foreground": 5 }, { "FontFamily": 1, "BorderLeft": null, "BorderRight": 0 }, - { - "HorizontalAlignment": 5 - }, { "FontFamily": 1, - "FontSize": 13.333333333333332, - "Foreground": 6 - }, - { - "FontFamily": 1, - "Formatter": 2 + "Formatter": 3 }, { "BorderLeft": null, @@ -1914,7 +1847,7 @@ }, { "FontFamily": 1, - "HorizontalAlignment": 5 + "HorizontalAlignment": 4 }, { "BorderRight": 0 @@ -1945,25 +1878,21 @@ "Strs": [ "Bold", "Body", - "[AUTO]General", "black", - "Background 2 0", + "[AUTO]General", "Left", "Text 1 50", + "Background 2 0", "Center" ], "Borders": [ { - "Color": 4 + "Color": 6 } ] }, "CellStyles": { "1,1": 0, - "1,31": 1, - "1,32": 1, - "1,33": 1, - "1,34": 1, "1,35": 1, "1,36": 1, "1,37": 1, @@ -1973,28 +1902,13 @@ "1,41": 1, "3,1": 2, "3,2": 1, - "3,4": 2, - "3,12": 1, - "3,13": 3, - "3,14": 1, - "3,15": 2, - "3,16": 1, - "3,17": 1, - "3,18": 1, - "3,19": 1, - "3,20": 1, - "3,22": 3, - "3,23": 1, - "3,24": 2, - "3,25": 1, - "3,26": 1, - "3,27": 1, + "3,3": 3, + "3,20": 2, + "3,21": 1, + "3,22": 2, "3,28": 1, "3,29": 1, "3,30": 1, - "3,32": 3, - "3,33": 1, - "3,34": 2, "4,1": 2, "4,2": 2, "4,3": 2, @@ -2010,224 +1924,269 @@ "4,13": 2, "4,14": 2, "4,15": 2, - "4,16": 2, - "4,17": 4, - "4,18": 4, - "4,19": 4, - "4,20": 4, - "4,21": 4, - "4,22": 4, - "4,23": 4, - "4,24": 4, - "4,25": 4, - "4,26": 4, - "4,27": 4, - "4,28": 4, - "4,29": 4, - "4,30": 4, - "4,31": 4, - "4,32": 4, - "4,33": 4, - "4,34": 4, - "4,35": 4, - "4,36": 4, - "4,37": 4, + "4,16": 3, + "4,17": 3, + "4,18": 3, + "4,19": 3, + "4,20": 3, + "4,21": 3, + "4,22": 3, + "4,23": 3, + "4,24": 3, + "4,25": 3, + "4,26": 3, + "4,27": 3, + "4,28": 3, + "4,29": 3, + "4,30": 3, + "4,31": 3, + "4,32": 3, + "4,33": 3, + "4,34": 3, + "4,35": 3, + "4,36": 3, + "4,37": 1, + "4,38": 1, "4,39": 1, - "4,40": 1, "4,41": 1, - "5,1": 2, + "5,1": 4, "5,2": 1, - "5,4": 4, + "5,3": 2, + "5,4": 1, + "5,5": 1, + "5,6": 1, + "5,7": 1, + "5,8": 1, + "5,9": 1, + "5,10": 4, + "5,11": 1, + "5,12": 2, + "5,13": 1, + "5,14": 1, + "5,15": 1, + "5,16": 1, + "5,17": 1, + "5,18": 1, + "5,19": 1, + "5,20": 4, + "5,21": 1, + "5,22": 2, "5,41": 1, "6,1": 2, "6,2": 2, - "6,4": 4, - "6,5": 4, - "6,6": 4, - "6,7": 4, - "6,8": 4, - "6,9": 4, - "6,10": 4, - "6,11": 4, - "6,12": 4, - "6,13": 4, - "6,14": 4, - "6,15": 4, - "6,16": 4, - "6,17": 4, - "6,18": 4, - "6,19": 4, - "6,20": 4, - "6,21": 4, - "6,22": 4, - "6,23": 4, - "6,24": 4, - "6,25": 4, - "6,26": 4, - "6,27": 4, - "6,28": 4, - "6,29": 4, - "6,30": 4, - "6,31": 4, - "6,32": 4, - "6,33": 4, - "6,34": 4, - "6,35": 4, - "6,36": 4, - "6,37": 4, - "6,38": 4, - "6,39": 4, - "6,40": 4, + "6,3": 3, + "6,4": 3, + "6,5": 3, + "6,6": 3, + "6,7": 3, + "6,8": 3, + "6,9": 3, + "6,10": 3, + "6,11": 3, + "6,12": 3, + "6,13": 3, + "6,14": 3, + "6,15": 3, + "6,16": 3, + "6,17": 3, + "6,18": 3, + "6,19": 3, + "6,20": 3, + "6,21": 3, + "6,22": 3, + "6,23": 3, + "6,24": 3, + "6,25": 3, + "6,26": 3, + "6,27": 3, + "6,28": 3, + "6,29": 3, + "6,30": 3, + "6,31": 3, + "6,32": 3, + "6,33": 3, + "6,34": 3, + "6,35": 3, + "6,36": 3, + "6,37": 3, + "6,38": 3, + "6,39": 3, "6,41": 1, - "7,1": 2, - "7,2": 1, "7,3": 1, - "7,4": 3, + "7,4": 1, + "7,5": 1, + "7,6": 1, "7,7": 1, - "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, - "7,21": 4, - "7,22": 4, - "7,23": 4, - "7,24": 4, - "7,25": 4, - "7,26": 4, - "7,27": 4, - "7,28": 4, - "7,29": 4, - "7,30": 4, - "7,31": 4, - "7,32": 4, - "7,33": 4, - "7,34": 4, - "7,35": 4, - "7,36": 4, - "7,37": 4, - "7,38": 4, - "7,39": 4, + "7,8": 1, + "7,9": 1, + "7,10": 1, + "7,11": 3, + "7,12": 3, + "7,13": 3, + "7,14": 3, + "7,15": 3, + "7,16": 3, + "7,17": 3, + "7,18": 3, + "7,19": 3, + "7,20": 3, + "7,21": 3, + "7,22": 3, + "7,23": 3, + "7,24": 3, + "7,25": 3, + "7,26": 3, + "7,27": 3, + "7,28": 3, + "7,29": 3, + "7,30": 3, + "7,31": 3, + "7,32": 3, + "7,33": 3, + "7,34": 3, + "7,35": 3, + "7,36": 3, + "7,37": 3, + "7,38": 3, + "7,39": 1, "7,41": 1, - "8,1": 5, - "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": 6, - "8,17": 5, - "8,18": 5, - "8,19": 5, - "8,20": 5, - "8,21": 5, - "8,22": 5, - "8,23": 5, - "8,24": 7, - "8,25": 7, - "8,26": 7, - "8,27": 7, - "8,28": 7, - "8,29": 7, - "8,30": 7, - "8,31": 7, - "8,32": 8, - "8,33": 8, - "8,34": 8, - "8,35": 8, - "8,36": 8, - "8,37": 8, - "8,38": 8, - "8,39": 6, - "8,40": 6, - "8,41": 6, - "9,8": 9, - "10,1": 10, - "10,5": 11, - "10,6": 11, - "10,7": 11, - "10,8": 9, - "10,10": 11, - "10,11": 12, - "11,8": 13, - "12,1": 14, - "12,8": 15, - "12,10": 16, - "13,8": 17, - "14,1": 14, - "14,2": 14, - "14,3": 14, - "14,4": 14, - "14,5": 14, - "14,6": 14, - "14,7": 14, - "14,8": 15, - "15,1": 18, - "15,8": 15, + "8,1": 2, + "8,2": 2, + "8,3": 2, + "8,4": 2, + "8,5": 2, + "8,6": 2, + "8,7": 2, + "8,8": 2, + "8,9": 2, + "8,10": 2, + "8,11": 2, + "8,12": 2, + "8,13": 2, + "8,14": 2, + "8,15": 2, + "8,16": 1, + "8,17": 2, + "8,18": 2, + "8,19": 2, + "8,20": 2, + "8,21": 2, + "8,22": 2, + "8,23": 2, + "8,24": 3, + "8,25": 3, + "8,26": 3, + "8,27": 3, + "8,28": 3, + "8,29": 3, + "8,30": 3, + "8,31": 3, + "8,39": 1, + "8,40": 1, + "8,41": 1, + "9,1": 2, + "9,2": 2, + "9,3": 2, + "9,4": 2, + "9,5": 2, + "9,6": 2, + "9,7": 2, + "9,8": 2, + "9,9": 2, + "9,10": 2, + "9,11": 2, + "9,12": 2, + "9,13": 2, + "9,14": 2, + "9,15": 2, + "9,16": 1, + "9,17": 2, + "9,18": 2, + "9,19": 2, + "9,20": 2, + "9,21": 2, + "9,22": 2, + "9,23": 2, + "9,24": 3, + "9,25": 3, + "9,26": 3, + "9,27": 3, + "9,28": 3, + "9,29": 3, + "9,30": 3, + "9,31": 3, + "9,39": 1, + "9,40": 1, + "9,41": 1, + "10,8": 1, + "11,1": 5, + "11,5": 6, + "11,6": 6, + "11,7": 6, + "11,8": 7, + "11,10": 6, + "11,11": 8, + "12,8": 9, + "13,1": 10, + "13,8": 11, + "13,10": 12, + "14,8": 13, + "15,1": 10, + "15,2": 10, + "15,3": 10, + "15,4": 10, + "15,5": 10, + "15,6": 10, + "15,7": 10, + "15,8": 11, "16,1": 14, - "16,2": 14, - "16,3": 14, - "16,4": 14, - "16,5": 14, - "16,6": 14, - "16,7": 14, - "16,8": 19, - "17,1": 14, - "17,2": 14, - "17,3": 14, - "17,4": 14, - "17,5": 14, - "17,6": 14, - "17,7": 14, - "17,8": 20, - "18,10": 1, - "18,11": 1, - "18,12": 1, - "18,13": 1 + "16,8": 11, + "17,1": 10, + "17,2": 10, + "17,3": 10, + "17,4": 10, + "17,5": 10, + "17,6": 10, + "17,7": 10, + "17,8": 15, + "18,1": 10, + "18,2": 10, + "18,3": 10, + "18,4": 10, + "18,5": 10, + "18,6": 10, + "18,7": 10, + "18,8": 16, + "19,10": 1, + "19,11": 1, + "19,12": 1, + "19,13": 1 }, "SheetStyle": { "FontFamily": 1 } }, "Spans": [ - "18,1,1,7", - "1,31,1,11", - "5,1,1,2", + "19,1,1,7", + "19,10,1,4", + "11,1,1,4", + "14,8,4,1", + "13,1,2,7", + "16,1,1,7", + "19,14,1,5", + "13,10,4,32", + "7,3,1,5", "3,1,1,2", - "18,10,1,4", - "3,13,1,2", - "3,15,1,6", - "3,22,1,2", - "3,24,1,7", - "3,32,1,2", - "3,34,1,7", - "7,1,1,2", - "10,1,1,4", - "5,4,1,37", - "13,8,4,1", - "12,1,2,7", - "15,1,1,7", - "7,4,1,2", - "18,14,1,5", - "12,10,4,32", - "3,4,1,8" + "5,1,1,2", + "5,3,1,6", + "5,10,1,2", + "5,12,1,7", + "5,20,1,2", + "3,3,1,16", + "3,20,1,2", + "3,22,1,6", + "5,22,1,6", + "1,35,1,7" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2238,7 +2197,7 @@ "$type": "JQueryUI.CardListSortable, JQueryUI", "CellName": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!B13" + "SerializeProperty": "=项目列表!B14" }, "ColName": "排序", "Hasupdate": true, @@ -2303,18 +2262,31 @@ "PaperSize": {}, "Margin": {} }, + "BackgroundPictures": [ + { + "FitToBrowserWidth": true, + "Name": "e68acf20-ca11-424d-805b-7456a217b4cb.png", + "DisplayName": "背景图1", + "StyleInfo": { + "Fill": "Background 2 0" + }, + "IsAutomaticFill": false, + "Location": "0,242", + "Size": "1359,6" + } + ], "CustomNames": [ { "Name": "显示搜索栏", - "Formula": "项目列表!$K$19" + "Formula": "项目列表!$K$20" }, { "Name": "选中分组", - "Formula": "项目列表!$B$19" + "Formula": "项目列表!$B$20" }, { "Name": "新增项目临时流程实例ID", - "Formula": "项目列表!$O$19" + "Formula": "项目列表!$O$20" } ] -}//F1u04Dw3q7LSk9h9HGFJl1qTFKphgTLTkitZoa/89AKSJXsA0h+TxRyUBdx7g4Hdwpa6306p9Ds73Ee0R1WziEc7zCfhNRZcjSV+s4HWslKDU/yxVFbcXZxngLkUcMC3Bv/PiOIHc0IOfCNOzEStKOfvSTAFcs2GY7dwj6u9mWxHUzvnK+4lmcq911qEtXKnMGR2C9mfFt8VtjWV6wHQOd52o9FrxIgrZ8uMgnK6t222jouYP//bIfpyq2McCUD0+DZx1Id98EB8rLZZaNgJiC+vQ0tiveKK/OkeM2REnj6QwQsGPhNspF3jAoy5vzLHXNr5Tyiq1tJcNnVvuHvPuBUkthGaxGpM+i0oRqz14SBlYdJE1biN+qSwFyJw+6f3OsWXWTx7g+FS/GZc2jAZFKbevx+Iv/MOZLrShSlEOdMR1w6UCMQmi3OJ0iVj93OuTw8KbzHYA3W2BKh0loc9JbyON4dcQuCB9Xe1K1LBdlA/NJmYn+rgLrV4ILPW3vrsCF7OsnnRXYG96sf0RAaZHxaUjCAa9soE/TIMrOE4PQ2hX0Jns4/d3dHE10ED80dzbGZcUUhfWLXgs00eGoho43v1N9CO62B+24Zql49DO7lDj0ZC4fWbAep6j9pGiS9zKpk+ZLu4nIKWN8QwnBdYG6DAijXUWaovJDhlwYoebPQBBwUXYHar1R/GwiI9kYZFp7AGqosfhJE0mxwXpwK2uYyvt1wTckVYJXMNwyfjTSmGsPjBjqfEmeR37i9q9jrpwq0ySgBMEkpDNZ+HyHJ09cbQRBufYbIhMbzoEYKMGZqYbFOliIQ/02qKxoePlGYZ2Oc1kkziPp+SPm0c1Rl49ai5zVTRd9w2IkosNT9l7+qRTKKwhCxWBO87c0k5sVAPEPWFacOaWRswpw59FP1iNg==|920 \ No newline at end of file +}//IuYY4IRdvWNnU0aPtKI2+xm0lGmRi7u4mp8iDsAhkZJxgW6pY9AHwYqbQ7Ys+F9U9uzXp9IaMoiNvgN1n/f93sw0YBqpw9w7lYgt9TPfQBEPefqyI6gM0Vhck7HIpcDdSSvXUr8+zYSPLVSy9y/ngeaSGZPiNIZMNzb/ZHk7bqtig+BrIPrkg4f8ZEkB2vVwiyjgRKybBxvThdf/Wk8RCrj8HAAvS9ffxgLoZdnQ3kLa2WETyj61TQZmuhWOrszAapeon+ZGkJfA7SgvocbhwsuB5OJnC87XG4JDraVV2/IIV0WO88jaXIgU7b2A3732se1M2wsSd1YoiLrprI8gZfmL0t4G1iwNJYlCGAH2l/Qbw5LGruFBkRA0fO+4fN4bMkf3esIY742Z8TFEyD14cqZeBFV018m6FNPiyd23eNxcn+IPhZS/CKGh+80LZen9D5DqYNxrm0d1sooHjky6HcSSAaEOJ1fJZ1OLceH/HLxH74n8VxCaDp+9xNAGuHLLWFCv09YVHTJcOX5jL4+8hmVk5zYJ669PnlZTb41mokLEMmP9xAbDvxuR4UpxqSxxwIHGS9OhFvPj8/cymAlOQAyadDNKNDbCP86uax3gaGiUgEghPwCCoUaPz5dUAP7CL4vN2si8oKMW0/2BfWsqAY4e+CD9ezvafRLElKddwMSGqWiaQQ1rrCPoXHhfHx0VLNninJ+g4GCXqrNj2vqJ+RLdG5466/8j4cWr+oxrBQPWVTAE7Xn/xVvrOzSUYCA6JoKfadhh9TNzlMXiU9/8djnsI87v2e7baG3XK5En/cb/b7rdwtO+ZW/PTLtDuyaTz77qJsQOnqVd71ksc3t0vDpI4hMerVK9v8RK2oPSCA/imEpfrYsAzlhy6B34yQiNrjQU1LgU5o2Eyix0uAI1Ig==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.rd b/Pages/项目/项目列表.rd index d6f7712f..94d57838 100644 --- a/Pages/项目/项目列表.rd +++ b/Pages/项目/项目列表.rd @@ -1,22 +1,22 @@ { "PageType": 0, "ColumnCount": 43, - "RowCount": 19, + "RowCount": 20, "Formulas": { - "10,11": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" + "11,11": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" }, "CustomNames": [ { "Name": "显示搜索栏", - "Formula": "项目列表!$K$19" + "Formula": "项目列表!$K$20" }, { "Name": "选中分组", - "Formula": "项目列表!$B$19" + "Formula": "项目列表!$B$20" }, { "Name": "新增项目临时流程实例ID", - "Formula": "项目列表!$O$19" + "Formula": "项目列表!$O$20" } ] } \ No newline at end of file diff --git a/UserControlPages/重置查询按钮.json b/UserControlPages/重置查询按钮.json new file mode 100644 index 00000000..07c00754 --- /dev/null +++ b/UserControlPages/重置查询按钮.json @@ -0,0 +1,131 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0 + } + } + }, + "Count": 1, + "DefaultSize": 30.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 60.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 60.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 60.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 4, + "DefaultSize": 60.0 + }, + "Values": { + "0,0": "重置", + "0,2": "查询" + }, + "AttachInfos": { + "0,0": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.CallUserControlPageCommand, ServerDesignerCommon", + "CommandName": "次按钮单击", + "BreakpointIdentity": "70e35027-835b-4e52-be64-f435b483a163" + } + ], + "Text": "重置", + "TemplateKey": "_RS_Information3" + } + }, + "0,2": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.CallUserControlPageCommand, ServerDesignerCommon", + "CommandName": "主按钮单击", + "BreakpointIdentity": "693b99d0-0b91-4c72-8c5c-f0f5d13640aa" + } + ], + "Text": "查询", + "TemplateKey": "_RS_Main1" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + ], + "Types": { + "Strs": [ + "Body" + ] + }, + "CellStyles": { + "0,0": 0, + "0,1": 0, + "0,2": 0, + "0,3": 0 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "PageInfo": { + "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon", + "PropertyDefinitions": [ + { + "Name": "主按钮", + "PropertyType": 1, + "DefaultValue": "查询" + }, + { + "Name": "次按钮", + "PropertyType": 1, + "DefaultValue": "重置" + } + ], + "CommandDefinitions": [ + { + "Name": "主按钮单击" + }, + { + "Name": "次按钮单击" + } + ], + "MethodDefinitions": [], + "PageLoadedCommandList": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//lfMV05vQmsS5kqaK3WCnMvMuati5TS3FfNKNP94Mk7IMPD70Mgz2L9rUvYAvRw0JRk3DDkJDtCJ+JsA5i7Cd7g2RLJOVBibVcG5EZuTCtJetGym3zPK/wHTnjGFHtMWqZEFnLjHG+TpFN2rZ5mha6l2fdFXszuGu4JFtZ+PnnPYrsRzO17mMTSPcShMTifKGoVx+PQgSJtU2RR9z5YexwMGUCL54aUneTWkT1nuqBQTEWfAHxpULsAKP4CXtUJcHOTWuM4CZPcFuVB4tGHYeX5eTea9r62bu5/yyHYZ3Fu/93YH9G8C99VmZtvMU+rQ5BgU4noSjxpo9C2a/ZWjq6V/n+UTxDj9GwuKzHL87Yy91bqGGc6OjrPwLESKCweaYauXEjR6XvVu+dbbWdmzmN0SkjFCf9T94l1ITjvpAQyCymilolJbQFyXejK32XnXwAzasJLMoPyyJDLgehQxR9MqREBcfStTdYjycQZAV1wQpEKo6PPys3swypZNZWtG70ryJWxiJTV2XIYXWrqFTCnJwbeQvcCiY/Z7/upSmO4Mea034fATNnP+QCA9C6V8W2XSPmuTNUnY6kchMu6FHmkI9Ph0GvS2NiRxy3F5sgRuiun206KyNUm1/wuaA+uazGo7COpXp8QiN6ygzZFwypMnUxpTO+ahVqwlfsiVJ7fUrClsxQPDi7GjLzdtMS0nkRhXkIOFlr4DQVnEqrFR5vkATbRBkBgTWYD6PCuIbjZVvFjYbxakcxVh+WsjYNPj35QrmkqWWGuiNqxrJnQsQaBVF6WeGXomWb8v3EsxkMvzfWeyCT7P2wu0egl0U8Sy+n/tn3RmhbpgA9Pgf2Lubp4t5oFjjbbkrsdwiBaGo0ymV3SCV9r3QFRxpJH2n0Do8r7p9RFhLpcHxk1X8oA+/fA==|920 \ No newline at end of file diff --git a/UserControlPages/重置查询按钮.rd b/UserControlPages/重置查询按钮.rd new file mode 100644 index 00000000..1c0c2864 --- /dev/null +++ b/UserControlPages/重置查询按钮.rd @@ -0,0 +1,5 @@ +{ + "PageType": 3, + "ColumnCount": 4, + "RowCount": 1 +} \ No newline at end of file