diff --git a/.collaboration b/.collaboration
index 8992520c..4a0c490a 100644
--- a/.collaboration
+++ b/.collaboration
@@ -49,29 +49,11 @@
},
{
"ModuleName": "Table/客户表",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-27T19:00:57.7492124+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\客户\\客户表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/客户部门表",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-27T19:01:16.5336808+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\客户\\客户部门表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Tables/工时",
@@ -520,21 +502,7 @@
},
{
"ModuleName": "PCPage/项目列表",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-27T18:55:37.0564353+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/项目审批",
@@ -558,17 +526,7 @@
},
{
"ModuleName": "MasterPCPage/FGC_母版页",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-27T18:58:29.1860988+08:00",
- "ModuleType": 3,
- "ToRemoveFiles": [
- "MasterPages\\FGC_母版页.json",
- "MasterPages\\FGC_母版页.rd"
- ]
+ "ModuleType": 3
},
{
"ModuleName": "UserControlPage/工时记录列表",
@@ -644,20 +602,7 @@
},
{
"ModuleName": "Theme",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-27T18:59:06.2665333+08:00",
- "ModuleType": 9,
- "ToRemoveFiles": [
- "Theme\\CellTypeStyles",
- "Theme\\ListViewStyles",
- "Theme\\StyleDefaultNames",
- "Theme\\ThemeConfig",
- "Reports\\DefaultTheme.rdlx-theme"
- ]
+ "ModuleType": 9
},
{
"ModuleName": "image/内置图片",
@@ -1164,22 +1109,10 @@
},
{
"ModuleName": "PCPage/客户管理",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-27T18:54:41.5205252+08:00",
"ModuleType": 1
},
{
"ModuleName": "PCPage/客户信息子页面",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-27T19:00:23.4993535+08:00",
"ModuleType": 1
}
]
\ No newline at end of file
diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json
index b42c6a8f..795d85c2 100644
--- a/MasterPages/FGC_母版页.json
+++ b/MasterPages/FGC_母版页.json
@@ -169,6 +169,12 @@
"SelectedIconColorUseItemColor": true,
"IconColorUseItemColor": true,
"IsOldMenuPath": false,
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon",
+ "PageName": "客户管理"
+ }
+ ],
"CanVisitRoleList": [
"FGC_LoginUser"
]
@@ -544,7 +550,7 @@
"success": {
"backOverlayColor": {
"type": "color",
- "value": "rgba(50, 198, 130, 0.2)"
+ "value": "rgba(50,198,130,0.2)"
},
"svgColor": {
"type": "color",
@@ -792,4 +798,4 @@
"Formula": "FGC_母版页!$A$7"
}
]
-}//xg5Akibo6hix+k9aAdgG6E0devW+iR1BZQYZnFaNuLsk1t+dWCcX7jdAy6/bx8le+Dfu1PDMcRht7M1y3FSlmPXTo73/mBcVqmOTRLlfab9cM06abWaE6wPzXVLulST/M/cW3WzSkRQ5s2iCcQPLs3aQAnPh20JPHslPJ4LD1bQYBmumYT+bQOiBXbwwXjKTBboIMkZdo5xv/BjyAg/ZalDNpoy65TOOw+1hjgjgut+eBZjaK/8IH4hR0P4X1oakDZDeV/PZ6YZMzoBWmGDLOKWBKnZOVBMCBrjDoDUowjDPaB/YcGs8FsR8y6J1cu2Oe2pobUkuroxH5zCRFDKmGxDApdmGZXVfCVm/dEKUHfeDHhpm2+dcia+ytWSXS8zeVzgejknZrvhALnbVT0KDci1zor0fR34XbViUEbE8sK6BxCwU4T6ag5xIBcR1ZIWD2X6PhGeCnKWOHb9M4ZzblGpKe7o2VqXOaN/nBOxJnUgALHsq53fDOGVLSAQhhJy87d1kf5OjNEI2Ilsh3DmxZYj6BEAKOjbtSbQRbX+e5wvTU0gdnocGl6athM8pIla0fGlBub4dp+MRDjjbexDKF11e+z4WLCYEitJjZ3sg60CAt0/nSt6wgP5+pEGeKI3Ne3kuY6YIAp95nrfbZe60TsfgI6xsB6s2AXJYv2Ol+TEi7j04za6qGaXSEdpoZEU6h1HJuQouubVJdgL7aBMJA4gVCr0lwk5AaonvmD9/zVLJ6xbYCUockFXF5gFpl8U3ODqQLIHlI/FnfG1RGHMHkVCs2F/Bj7DY255Uik6EpWZwHU8IfU8bhZA1BpyUKJevBXkAPTbLNqlksXL+aNeO098ZRd9DHtkm4z2wszPD8s7+dsshZyU0mCzqCuy7BfN+wKm7nwegHlqqcIu6rlw0DQ==|920
\ No newline at end of file
+}//MjW7En59skzOvmvDVjF8H9Y7h36s2pkYfyMWC4gGl2WikujmM7SQrZ3Vw6fWBBEraK/sOD0ZACZedY9vi9XKUFAjyVT1AiJLxJeZbK7Z79h1dNTb2ZsMuvq4W2LIb99PfRDpLwulwQfpd17irm1E357AQlCMTTnONrAI1qtrjpBl+0Q4+99uasRiJ/CIRyWUwTA9+U48hM4GuKQ+yy11b9QSE0coO61e2YEfiobD2XbJ/EyH/mRq4GLOb4mCU+imu0nqLnvbPRZ0qqIiGzkreh/6gZxeOg8oBqoOr0gnSNj2Hq7yqMdZ9cL/q7+hJe4iQXL8AnuYZJpL59kBdTdWJjIQQuMQWYOwQkZH7HYZmKAPbaY+rM0nATRtfbDhV5BQXhHQFli1zc50ZNs8QALVektCAMt72gJa/p83gUj5+odErQDGu83Lj1/KwvW8/sWJpj0FM2f/79GtnS+UXtmzBC280dENdo7qG3Z9OL/DG0GpvEu5O0F3NK/UT8wunnpnGfZvtR1GHndKiWC8hjOEcwKsTzVmoeLFdw4BxyVL7YAHB2PwX5BhaHhwHSa0oNSeBCBIqm/5fAshsjdNuC29CpgGID2wfV+k4cKYv7H8iqiiLflxAXtTff3euvvM5ZsZW/bejMBqG/+9WbDNp/2FNFjnyjNd0xIIKjDWK2uobZbEq9AU/SeIQodZZZpmzOt55TN3QZAHhF35EeeowecZFQ0FH6WVNrFLRU8J0Gm6MiYx+hZbvpjPOXxL6yrT1b3As+uMgS/qUohn7L52knsfK/o8XA6TZ6ET2WIH3UjDB5LOJe14ivWTm3p7mjcAmBvl0jWwy/vXN63SL2GkfsaZZT5Mwjl4E2draTw251k2O3/h0/dg8OkbB6IeWi5DIEwKTON+aHw1RF2ZMS8ISg/OyQ==|920
\ No newline at end of file
diff --git a/Pages/客户/客户信息子页面.json b/Pages/客户/客户信息子页面.json
new file mode 100644
index 00000000..0f48c469
--- /dev/null
+++ b/Pages/客户/客户信息子页面.json
@@ -0,0 +1,472 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "10": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "12": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "13": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "15": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "16": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "18": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "19": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "21": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "22": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 29.0
+ }
+ }
+ },
+ "Count": 24
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 23.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "8": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "10": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ }
+ },
+ "Count": 11,
+ "DefaultSize": 32.0
+ },
+ "Values": {
+ "1,1": "客户概览",
+ "3,1": "客户税号",
+ "6,1": "客户名称",
+ "9,1": "客户地址",
+ "12,1": "邮箱地址",
+ "15,1": "部门经理",
+ "18,1": "部门经理",
+ "21,1": "部门数量"
+ },
+ "AttachInfos": {
+ "4,1": {
+ "BindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "客户税号",
+ "GUID": "ded11e2f-eac6-4a81-bf8e-a2d117980606"
+ }
+ },
+ "7,1": {
+ "BindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "客户名称",
+ "GUID": "4a948862-ff61-4a40-a74c-95d2be310176"
+ }
+ },
+ "10,1": {
+ "BindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "地址",
+ "GUID": "d12e0064-1c52-42a4-adde-2a7065b04f61"
+ }
+ },
+ "13,1": {
+ "BindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "邮箱",
+ "GUID": "bd0148ae-300c-487d-b8f0-5ea5cb098c89"
+ }
+ },
+ "16,1": {
+ "BindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "客户经理",
+ "GUID": "1da143e9-53a8-4edc-a63a-e652e523fa18",
+ "AttachType": {
+ "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+ "UserColumnAttachType": 1
+ }
+ }
+ },
+ "19,1": {
+ "BindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "客户经理",
+ "GUID": "60b1abc0-4564-48b3-bf8d-cfaaaa816b5c",
+ "AttachType": {
+ "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+ "UserColumnAttachType": 1
+ }
+ }
+ },
+ "22,1": {
+ "BindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "部门数量",
+ "GUID": "bb975579-01e1-4cea-a537-6faabbfaee3c"
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontSize": 16.0,
+ "Foreground": 0
+ },
+ {
+ "Foreground": 1
+ },
+ {
+ "FontFamily": 2,
+ "FontSize": 13.333333333333332,
+ "Foreground": 1
+ },
+ {
+ "FontSize": 14.666666666666666
+ },
+ {
+ "FontFamily": 2,
+ "FontSize": 13.333333333333332
+ },
+ {
+ "FontFamily": 2,
+ "FontSize": 13.333333333333332,
+ "Foreground": 1,
+ "Formatter": 3
+ },
+ {
+ "FontFamily": 2,
+ "FontSize": 14.666666666666666
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "black",
+ "Text 1 50",
+ "Body",
+ "[AUTO]General"
+ ]
+ },
+ "CellStyles": {
+ "1,1": 0,
+ "3,1": 1,
+ "3,9": 2,
+ "4,1": 3,
+ "5,0": 4,
+ "5,1": 4,
+ "5,2": 4,
+ "5,3": 4,
+ "5,4": 4,
+ "5,5": 4,
+ "5,6": 4,
+ "5,7": 4,
+ "5,8": 4,
+ "5,9": 4,
+ "5,10": 4,
+ "6,0": 4,
+ "6,1": 5,
+ "6,2": 4,
+ "6,3": 4,
+ "6,4": 4,
+ "6,5": 4,
+ "6,6": 4,
+ "6,7": 4,
+ "6,8": 4,
+ "6,9": 5,
+ "6,10": 4,
+ "7,0": 4,
+ "7,1": 6,
+ "7,10": 4,
+ "8,0": 4,
+ "8,1": 4,
+ "8,2": 4,
+ "8,3": 4,
+ "8,4": 4,
+ "8,5": 4,
+ "8,6": 4,
+ "8,7": 4,
+ "8,8": 4,
+ "8,9": 4,
+ "8,10": 4,
+ "9,0": 4,
+ "9,1": 2,
+ "9,2": 4,
+ "9,3": 4,
+ "9,4": 4,
+ "9,5": 4,
+ "9,6": 4,
+ "9,7": 4,
+ "9,8": 4,
+ "9,9": 5,
+ "9,10": 4,
+ "10,0": 4,
+ "10,1": 6,
+ "10,10": 4,
+ "11,0": 4,
+ "11,1": 4,
+ "11,2": 4,
+ "11,3": 4,
+ "11,4": 4,
+ "11,5": 4,
+ "11,6": 4,
+ "11,7": 4,
+ "11,8": 4,
+ "11,9": 4,
+ "11,10": 4,
+ "12,0": 4,
+ "12,1": 5,
+ "12,2": 4,
+ "12,3": 4,
+ "12,4": 4,
+ "12,5": 4,
+ "12,6": 4,
+ "12,7": 4,
+ "12,8": 4,
+ "12,9": 5,
+ "12,10": 4,
+ "13,0": 4,
+ "13,1": 6,
+ "13,10": 4,
+ "14,0": 4,
+ "14,1": 4,
+ "14,2": 4,
+ "14,3": 4,
+ "14,4": 4,
+ "14,5": 4,
+ "14,6": 4,
+ "14,7": 4,
+ "14,8": 4,
+ "14,9": 4,
+ "14,10": 4,
+ "15,0": 4,
+ "15,1": 5,
+ "15,2": 4,
+ "15,3": 4,
+ "15,4": 4,
+ "15,5": 4,
+ "15,6": 4,
+ "15,7": 4,
+ "15,8": 4,
+ "15,9": 5,
+ "15,10": 4,
+ "16,0": 4,
+ "16,1": 6,
+ "16,10": 4,
+ "17,0": 4,
+ "17,1": 4,
+ "17,2": 4,
+ "17,3": 4,
+ "17,4": 4,
+ "17,5": 4,
+ "17,6": 4,
+ "17,7": 4,
+ "17,8": 4,
+ "17,9": 4,
+ "17,10": 4,
+ "18,0": 4,
+ "18,1": 5,
+ "18,2": 4,
+ "18,3": 4,
+ "18,4": 4,
+ "18,5": 4,
+ "18,6": 4,
+ "18,7": 4,
+ "18,8": 4,
+ "18,9": 5,
+ "18,10": 4,
+ "19,0": 4,
+ "19,1": 6,
+ "19,2": 4,
+ "19,3": 4,
+ "19,4": 4,
+ "19,5": 4,
+ "19,6": 4,
+ "19,7": 4,
+ "19,8": 4,
+ "19,9": 4,
+ "19,10": 4,
+ "20,0": 4,
+ "20,1": 4,
+ "20,2": 4,
+ "20,3": 4,
+ "20,4": 4,
+ "20,5": 4,
+ "20,6": 4,
+ "20,7": 4,
+ "20,8": 4,
+ "20,9": 4,
+ "20,10": 4,
+ "21,0": 4,
+ "21,1": 5,
+ "21,2": 4,
+ "21,3": 4,
+ "21,4": 4,
+ "21,5": 4,
+ "21,6": 4,
+ "21,7": 4,
+ "21,8": 4,
+ "21,9": 5,
+ "21,10": 4,
+ "22,0": 4,
+ "22,1": 6,
+ "22,10": 4
+ },
+ "SheetStyle": {
+ "FontFamily": 2,
+ "FontSize": 13.333333333333332
+ }
+ },
+ "Spans": [
+ "10,1,1,9",
+ "13,1,1,9",
+ "16,1,1,9",
+ "19,1,1,9",
+ "7,1,1,9",
+ "22,1,1,9",
+ "4,1,1,9"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ }
+ ]
+ },
+ "RowBreakLines": [],
+ "RepeatRangeSettings": []
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ },
+ "BackgroundPictures": [
+ {
+ "Name": "edb0d31a-aff3-486f-bedb-62f7c3cb1144.png",
+ "DisplayName": "背景图1",
+ "StyleInfo": {
+ "Fill": "Accent 1 0"
+ },
+ "IsAutomaticFill": false,
+ "Location": "14,27",
+ "Size": "3,18"
+ }
+ ]
+}//5iW0hpSb9ul/Dh19JhnNsY8VvY1BPgvBENxZglWQPKbEdayOfHd3o5ZGe2ItcNBkMXj0Dw4ycpyYXNMeRE0pUQsbR5V5iK2E3b4n2sGwsO+zsemycP5YuVCLm/Oi2vvFuj4N7E/Ki4/raMBtAP38cIeGjRfKyTAQc52qnAokrmc8OUHfT1F+VxjW7UhUax4RH3y1XEH+yfXDODQUTTWZ7nnKsaemIBZbVuDPgKgT4H3902KX8ozKj+FcB4l9RumApkP8zilJT+Dt8Nxf8P0X4oDITest2y52uosb7j8UmGa1a/dxFvDzMuogL69UFC+z717mdlBSlogfqWIX8fIdnfgyvboMg9j6OssgpLwYrmj74xWtNjms6AtsT/GmPQo8RVfwU2uLydgjXEx3eC9IJX0S35raFKelN6OnmrKM77K/9qcR7cAlhfdA/CvUGTwZ59A7s0lldbRoUQfxlyKg6mLDA62UcnwZJp/gucCqhx8Cn1Tabrh7Jz9dIuC3APTMtFDb/dvy/SaHmMic8elSWJXtI93yKseemC/eK5+nuwYtIlhE2xZNEAD1bbUbn+mEG/lVQuNdSu2tBv8V1Wl0wgcd6S/dgw5EFNfX7vxOkXDDah3nFEFkhEjrLyCXBSdv5hl31BtDwcLu+u2F7g3w3wAgJU5EoRDnHMDUfygXMF8krpEBzy93Bw8srhLHZlWVKL56gphyFWc1p5gx69mRj7FAT/TIZPVcAjOJO3iIQpP7X8wb/rz8co24dxi6qsD/r3/gzO9Un6FssXybR8udcIAfWIWIA8rh3b1e77O9qNpp1lHjCx9woxuLOYCUmch8X+2+FtI+BbVrrUtR3iy2EofDJLiqzVLUwwup08tZIR/sYxpiQ5osFujG61lpz3hhueEb7PnEuEvd8vibDO7zfA==|920
\ No newline at end of file
diff --git a/Pages/客户/客户信息子页面.rd b/Pages/客户/客户信息子页面.rd
new file mode 100644
index 00000000..5eb71cac
--- /dev/null
+++ b/Pages/客户/客户信息子页面.rd
@@ -0,0 +1,5 @@
+{
+ "PageType": 0,
+ "ColumnCount": 11,
+ "RowCount": 24
+}
\ No newline at end of file
diff --git a/Pages/客户/客户管理.json b/Pages/客户/客户管理.json
new file mode 100644
index 00000000..068c4153
--- /dev/null
+++ b/Pages/客户/客户管理.json
@@ -0,0 +1,713 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "8": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "10": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "11": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "12": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "13": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "14": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "15": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "16": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "17": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "18": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "19": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "20": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "21": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "22": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 38.0,
+ "Mode": 1
+ }
+ },
+ "23": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ }
+ },
+ "Count": 24,
+ "DefaultSize": 32.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "8": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "10": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "11": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "12": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "13": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "14": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "15": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "16": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "17": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "18": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "19": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "20": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "21": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "22": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "23": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "24": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "25": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "26": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "27": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "28": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "29": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "30": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "31": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "32": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "33": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ },
+ "34": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ },
+ "37": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ },
+ "38": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ },
+ "39": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ },
+ "40": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ },
+ "41": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ },
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ },
+ "42": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 33,
+ 34,
+ 35,
+ 36,
+ 37,
+ 38,
+ 39,
+ 40,
+ 41,
+ 42
+ ],
+ "Count": 43,
+ "DefaultSize": 32.0
+ },
+ "Values": {
+ "1,1": "%PageTitle%",
+ "1,33": "客户信息子页面",
+ "3,28": "查询"
+ },
+ "AttachInfos": {
+ "1,33": {
+ "CellType": {
+ "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
+ "PageName": "客户信息子页面",
+ "OverflowMode": 1
+ }
+ },
+ "3,1": {
+ "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": "输入关键字",
+ "prefixIcon": {
+ "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin",
+ "Name": "Application/047_search_8.svg",
+ "BuiltIn": true,
+ "Color": "#c0c4cc"
+ },
+ "resize": "none"
+ }
+ },
+ "3,28": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "Text": "查询",
+ "TemplateKey": "_RS_Main1"
+ }
+ },
+ "5,1": {
+ "CellType": {
+ "$type": "ElementUI.TableCellType, ElementUI",
+ "ElTableName": "EL表格1",
+ "RowClickCommand": {
+ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
+ "Commands": [
+ {
+ "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+ "CurrentRowInfo": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "ID",
+ "GUID": "fc1c30de-7b67-4ecc-a387-2703694f36c2"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=客户管理!行数据.ID"
+ }
+ }
+ },
+ {
+ "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=客户管理!AH:AQ"
+ },
+ "Value": true
+ }
+ ]
+ }
+ ],
+ "ParamProperties": {
+ "dataRow": "行数据",
+ "ID0": "行数据.ID",
+ "客户名称1": "行数据.客户名称",
+ "客户税号2": "行数据.客户税号",
+ "地址3": "行数据.地址",
+ "邮箱4": "行数据.邮箱"
+ }
+ },
+ "bindingOptions": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "客户表",
+ "BindingInfos": [
+ {
+ "BindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "ID",
+ "GUID": "9439ebd2-73ff-41df-a76a-1214e479caf5"
+ },
+ "ColumnName": "ID"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "客户名称",
+ "GUID": "4d1f312d-8970-47c5-8e40-20f59654f2ef"
+ },
+ "ColumnName": "客户名称"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "客户税号",
+ "GUID": "14830a8d-00ff-45f8-aefd-ef26b74b9720"
+ },
+ "ColumnName": "客户税号"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "地址",
+ "GUID": "73daa90c-dc0a-4012-9762-b125e4c29556"
+ },
+ "ColumnName": "地址"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "邮箱",
+ "GUID": "b7a012e3-3d6a-4484-b745-31c0cb4d92fb"
+ },
+ "ColumnName": "邮箱"
+ }
+ ],
+ "OrderBySqlCondition": {
+ "OrderByColumns": [
+ {
+ "ColumnBindingInfo": {
+ "TableName": "客户表",
+ "ColumnName": "FGC_CreateDate",
+ "GUID": "68cb565c-4787-4220-be0d-ca2a371dab12"
+ },
+ "Order": 1
+ }
+ ]
+ },
+ "CustomColumns": []
+ },
+ "columns": [],
+ "showActionButtons": true,
+ "actionButtons": [
+ {
+ "$type": "ElementUI.ActionButton, ElementUI",
+ "type": "button",
+ "Name": "详情",
+ "styleType": "Accent 1 0",
+ "shape": "default"
+ },
+ {
+ "$type": "ElementUI.ActionButton, ElementUI",
+ "type": "button",
+ "Name": "删除",
+ "styleType": "Accent 5",
+ "shape": "default"
+ }
+ ],
+ "sumText": "合计",
+ "size": "default"
+ }
+ },
+ "22,1": {
+ "CellType": {
+ "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI",
+ "AttachElementTable": true,
+ "ElementTableName": "EL表格1",
+ "pageSize": 20,
+ "pagerCount": 7,
+ "layout": [
+ {
+ "layoutItem": "prev"
+ },
+ {
+ "layoutItem": "pager"
+ },
+ {
+ "layoutItem": "next"
+ },
+ {
+ "layoutItem": "jumper"
+ },
+ {
+ "layoutItem": "->"
+ },
+ {
+ "layoutItem": "total"
+ }
+ ],
+ "pageSizes": [
+ {},
+ {
+ "value": 20
+ },
+ {
+ "value": 30
+ },
+ {
+ "value": 40
+ },
+ {
+ "value": 50
+ },
+ {
+ "value": 100
+ }
+ ],
+ "hideOnSinglePage": true
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "BorderLeft": 0
+ },
+ {
+ "FontFamily": 1,
+ "FontSize": 18.666666666666664,
+ "FontWeight": 2
+ },
+ {
+ "FontFamily": 1,
+ "BorderLeft": 0
+ },
+ {
+ "FontSize": 13.333333333333332
+ },
+ {
+ "FontFamily": 1,
+ "FontSize": 13.333333333333332
+ },
+ {
+ "FontFamily": 1
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Background 1 -5",
+ "Body",
+ "Bold"
+ ],
+ "Borders": [
+ {
+ "Color": 0
+ }
+ ]
+ },
+ "CellStyles": {
+ "0,33": 0,
+ "1,1": 1,
+ "1,33": 2,
+ "2,33": 0,
+ "3,1": 3,
+ "3,28": 4,
+ "3,29": 5,
+ "3,30": 5,
+ "3,33": 0,
+ "4,33": 0,
+ "5,33": 0,
+ "6,33": 0,
+ "7,33": 0,
+ "8,33": 0,
+ "9,33": 0,
+ "10,33": 0,
+ "11,33": 0,
+ "12,33": 0,
+ "13,33": 0,
+ "14,33": 0,
+ "15,33": 0,
+ "16,33": 0,
+ "17,33": 0,
+ "18,33": 0,
+ "19,33": 0,
+ "20,33": 0,
+ "21,33": 0,
+ "22,1": 3,
+ "22,33": 0,
+ "23,33": 0
+ },
+ "SheetStyle": {
+ "FontFamily": 1
+ }
+ },
+ "Spans": [
+ "22,1,1,41",
+ "5,1,17,30",
+ "3,1,1,26",
+ "3,28,1,3",
+ "1,33,21,9"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "MasterPageName": "FGC_母版页",
+ "Title": "客户管理",
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ }
+ ]
+ },
+ "RowBreakLines": [],
+ "RepeatRangeSettings": []
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ },
+ "CustomNames": [
+ {
+ "Name": "客户统计信息子页面",
+ "Formula": "客户管理!$AH$2"
+ }
+ ]
+}//P4MOs17nLMQvGiWIfR1wPMV9Fn95QemI+WEUIkmhFKVABm8an3O+uSsYkaRC3oYxVKkMskTAckUXn5tcg7RAdyKYvcHBP5G1wTanGTTOzk57JTpPkmaH7XNqm9MDdBKeI7/Gg5O8Hae53xB2IcbiUShtEKTl9eeHgLxrnkO6gg+doYIwy2qtg6lgIVqrCju3QByM5p/2ZOlK8ODVZGmJzxotBQ4/XUX+WrxEPJStDXmkkaWxvAD0+zLnOBaNMNWPdD2wtcYGH7le35L6+CwojOaAzX6HBE15KqnAJMYm8ExgohnB520SFh3KjGyXS/q+ecQdkG20GgW/uQU5/Puez6j0mG1lLiu7WCpSW//MZ/i6nnDTObSQXts0nLxF2Vu0kog64uNLG9/HADN+n7ifhvFpOuZudDXo5YmMqPKNCgM2KhccCE4aGqZ5ptyeu/+VyaubRBGbkr8F4OG1DuAshf1/1KyJ/nreS/qZUPhpZlSvFOfRWF4BgkwZAWvdTgV2SjiMfXt8Cr12aBX6I4SDDmzT9UVLEAbynPU6MmGVCe2s0kUvyLWgSyTAQZPMn58evr4BEA5jA5Jft9OlpUpZrQd8UP5lhfygzQ1iSoKPk6Q/cxk0j2+QWQ2YnQZAai4eVFvUEbgyJiASO4G6+SZCC0gGt1Ya0wyp5AUu7RzeGVLuY4TxG2sD/2fMnOISC/XfxNRNb5DG2IjVaFzjtMJNtnJRczeZZf1Yr49hBNqM0Ieq7ovjkugviEtoQOPw91NxVUK/e48yBRBPAdZ/bAcTQZasVgPkI/f1YUu7IARQNjQ+VkwpRAbAgDoJ4dqPbLMbStlvOoA2mbZAEJPUfum2C3FDdxLU90JPl5oA1yqgSOxX/jUDW0IvGwLL2Ar0xMWEpRgYQ9T2gc0kjLQ7uB4gYg==|920
\ No newline at end of file
diff --git a/Pages/客户/客户管理.rd b/Pages/客户/客户管理.rd
new file mode 100644
index 00000000..de477843
--- /dev/null
+++ b/Pages/客户/客户管理.rd
@@ -0,0 +1,11 @@
+{
+ "PageType": 0,
+ "ColumnCount": 43,
+ "RowCount": 24,
+ "CustomNames": [
+ {
+ "Name": "客户统计信息子页面",
+ "Formula": "客户管理!$AH$2"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json
index 9923324f..1a5d4a25 100644
--- a/Pages/项目/项目列表.json
+++ b/Pages/项目/项目列表.json
@@ -275,7 +275,7 @@
"DefaultSize": 32.0
},
"Values": {
- "1,1": "项目管理",
+ "1,1": "%PageTitle%",
"3,1": 0,
"3,37": "添加项目",
"6,1": "项目分组",
@@ -934,6 +934,7 @@
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
"MasterPageName": "FGC_母版页",
+ "Title": "项目列表",
"PermissionData": {
"$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
"permissionResource": {
@@ -961,4 +962,4 @@
"Formula": "项目列表!$B$11"
}
]
-}//3ywh8rC9maB3EI7PHGvgdwK/xbYd6kr7kV2lmqyeLYzYWIaK3sUDCsHEGGu0duKoUFlgTBtu+6U7RkYoqCB017ItKcgGOYd2MNlrt6+A8Lh7iVHqo9VVZZOWkL/1im1Mma2mPPd90TOQrDH1ErFfaiHNWPaJ/h5sDQS8vh0POPh21RubUiLXiLAd/9fiXH+tRQd2qjCMkWy8t/sjq3wEhfrR2rr+UVkADLmV2KR7xBdt2OggEcrSCetyJw1ie69ZAP1xGjM3+0mgKCvw5TLlF5QI059pyKFyaY5gYAysGAg0iHNdJ2h4V2W20u5I9qDjTUoJpfvj2BXP7NYOVczq4pcWValeEE+ySsEuFyGljvshSAlBEBGMtX3+1OEjUye2/eBazXsor5aOdxI7/nwxzaov9HKlUo7aS5OSMPwUeIE6XCmDq7k9NPOBSo/8ODH3QWit7HABLtvYl1NFKCiSgn5gX45TDnNL1CqfGWs+iIcZEbDECm3oedq5+7TNZe0/WPbFgLix9Xvm8Smf2Am4YokMs/Eb0tpxtWyBEEbPW6eGQ2CRHqJtuGSIjdkuG1jVhaHO1jYqJXUS7IQbNuga+dXW9r2NJ2fW7UNFe7xFTmyfwnDHs20myRmgXrlmPhjt7L9sseGbmW0ncCtMTz5d0mJW8o8xO64Mtxc+glA+snkwoDcnlCgGGcjioowieAjNJ6u9zBuW3IF2VQGw65K3YhO7GUEg359VuscYtDssZbPa90hNQzbaOQiJNYMYCvaR71URxmtBYmhjIz/o63Axi0T5C9smsYgCuX11DidSZ4V0259YkvDBZesA9PamkQbKB37kLqD5dGDDvkR2dAumFe/mC2Pql/Rnwc3RKh3Vgzb6VohV+4kxoTAFCVBzKz2n0u1wqcYa73SmFqQ8NLC9Tg==|920
\ No newline at end of file
+}//L/oLxc5F3x0HUzLXU25aBd7VICxp8vA+Ug3NSsy5Srn+auo17nyWxSBoH4aGiNbI/pFjBW5AI9rflIfNhCyWSriuZMiQ7BdCPgE/sO/MfReV+6BFAVRD1+CHpoysxiGwKLi25OypCI1b9jrCzU6SYe2ZdMGiJyr1+TJlPtqtaB29RZejAoDGEWJXF9tcVIUFE17Ms5bNCGJaGXhfO5wsIyJk6I2kOOeYg+7RHEva0euZDD8xaiUaJF4Djj95OT03w6MdUzf8pmVQP/bMB4MCBffbEmiMJweMRrz3OoAnu6JL3cTG749kURgaKXwRaOS3d5NoEFkOj7Yn3rBrP+iFyhmuNMqWGE9C7L4DQCudQpweqMWtDfn9WQNt/V0tc5r+f0ALDVxhN6AVoBYW010dNulVI/fvknCGkROlYIciTFuk53kjxrHtfl3HcPVgu2/0ptUGNzExsN8Wdr/bJbuVPKgRXqZkY6jwhsw+lJ5Cku+L9WXEe0dTcLphfA8OXU2NP8z1JF1ULyvDW3ZaIb9MHTu1dUuhMuVRAaPQRQ4fxU67bOJlqOQqjX1lUZ47JSNE9K/0FSnjHxJ5A6OXLGMDATCvDRrxQrWjoBwviKxjKVGhsuHQyz7URHKeMaE/lZvgNZr17ey5Ou9i98cJjHZBzxHPMjaE1uAlOg43/1icE9ToGRPtNcnrY7Z8SfTMUBoFF7iexHixg9RDCCv1ymooqywqsQyjdj+FLy9dHdj5ALNuPFR6un2ZB23SS8Uudz022cT/kKENtZZjgYcR6ZNuFOhFcB+926/3mX8Oje+BSvYfakT7pz/vgKGrdnCG6TcReyGF43V10101f0S/0gzHOBrvoqHMT42DMufMZm56SPMI0WgkPbU7e891R/ctS+GyIxinL8EjpI+M9+KpLim+uw==|920
\ No newline at end of file
diff --git a/Reports/DefaultTheme.rdlx-theme b/Reports/DefaultTheme.rdlx-theme
index e6c7d3d1..92dc0aaf 100644
--- a/Reports/DefaultTheme.rdlx-theme
+++ b/Reports/DefaultTheme.rdlx-theme
@@ -1 +1 @@
-#000000#042531#FFFFFF#EAEBDE#1890FF#8BB73D#EBC54B#EA772A#D03736#904DA0#FFFFFF#FFFFFF微软雅黑10ptNormal微软雅黑10ptNormal
\ No newline at end of file
+#000000#042531#FFFFFF#F3F3F3#1890FF#8BC34A#EBC54B#EA772A#D03736#904DA0#FFFFFF#FFFFFF微软雅黑10ptNormal微软雅黑10ptNormal
\ No newline at end of file
diff --git a/Tables/客户/客户表.json b/Tables/客户/客户表.json
index 2268d466..e343407b 100644
--- a/Tables/客户/客户表.json
+++ b/Tables/客户/客户表.json
@@ -39,6 +39,26 @@
"Name": "邮箱",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "客户经理",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
+ "BindingInfo": {
+ "TableName": "客户部门表",
+ "ColumnName": "ID",
+ "GUID": "5f35e37f-181e-4eb6-ad89-8f6935db2cdb"
+ },
+ "AggregateFunction": 1,
+ "DataColumnName": "ID",
+ "DetailTableName": "客户部门表",
+ "Name": "部门数量",
+ "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
diff --git a/Tables/客户/客户部门表.json b/Tables/客户/客户部门表.json
index fd49c6ca..e8899aa7 100644
--- a/Tables/客户/客户部门表.json
+++ b/Tables/客户/客户部门表.json
@@ -40,10 +40,10 @@
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
- "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon",
"DatabaseColumnType": "nvarchar",
"MaxLength": -1,
- "Name": "客户经理",
+ "Name": "对接成员",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
diff --git a/Theme/ThemeConfig b/Theme/ThemeConfig
index 7f2a3596..007f8bbc 100644
--- a/Theme/ThemeConfig
+++ b/Theme/ThemeConfig
@@ -1 +1 @@
-{"BasePathName":"13Blue","FontFamily":"微软雅黑","ThemeColors":{"Name":"Blue","Colors":{"Name":"","ColorList":["#FFFFFFFF","#FFEAEBDE","#FF000000","#FF042531","#FF1890FF","#FF8BB73D","#FFEBC54B","#FFEA772A","#FFD03736","#FF904DA0","#00FFFFFF","#00FFFFFF"],"BackgroundColor1":"#FFFFFFFF","BackgroundColor2":"#FFEAEBDE","TextColor1":"#FF000000","TextColor2":"#FF042531","Accent1":"#FF1890FF","Accent2":"#FF8BB73D","Accent3":"#FFEBC54B","Accent4":"#FFEA772A","Accent5":"#FFD03736","Accent6":"#FF904DA0","Hyperlink":"#00FFFFFF","FollowedHyperlink":"#00FFFFFF"},"Category":"内建"}}
\ No newline at end of file
+{"BasePathName":"13Blue","FontFamily":"微软雅黑","ThemeColors":{"Name":"pms","Colors":{"Name":"","ColorList":["#FFFFFFFF","#FFF3F3F3","#FF000000","#FF042531","#FF1890FF","#FF8BC34A","#FFEBC54B","#FFEA772A","#FFD03736","#FF904DA0","#00FFFFFF","#00FFFFFF"],"BackgroundColor1":"#FFFFFFFF","BackgroundColor2":"#FFF3F3F3","TextColor1":"#FF000000","TextColor2":"#FF042531","Accent1":"#FF1890FF","Accent2":"#FF8BC34A","Accent3":"#FFEBC54B","Accent4":"#FFEA772A","Accent5":"#FFD03736","Accent6":"#FF904DA0","Hyperlink":"#00FFFFFF","FollowedHyperlink":"#00FFFFFF"},"Category":"自定义"}}
\ No newline at end of file