From 6bbee6b6294effd11fd2f2b2f12726f68f0d6bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Thu, 4 Jul 2024 15:27:41 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=8F=98=E6=9B=B4=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E5=8F=8A=E5=AD=97=E6=AE=B5","Messag?= =?UTF-8?q?eType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E8=A1=A8"},{"State":1,"Type":7,"Name":"Table/?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=83=A8=E9=97=A8=E8=A1=A8"},{"State":1,"Typ?= =?UTF-8?q?e":1,"Name":"PCPage/=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86"},{"St?= =?UTF-8?q?ate":1,"Type":1,"Name":"PCPage/=E5=AE=A2=E6=88=B7=E8=AF=A6?= =?UTF-8?q?=E6=83=85"},{"State":1,"Type":1,"Name":"PCPage/=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=AD=90=E9=A1=B5=E9=9D=A2"},{"Stat?= =?UTF-8?q?e":1,"Type":1,"Name":"PCPage/=E5=AE=A2=E6=88=B7=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E5=AE=A2=E6=88=B7=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86"},{"St?= =?UTF-8?q?ate":3,"Type":20,"Name":"ServerCommands/=E5=AE=A2=E6=88=B7"},{"?= =?UTF-8?q?State":3,"Type":15,"Name":"ServerCommand/=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=AE=A2=E6=88=B7"},{"State":3,"Type":7,"Name":"Table/?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=86=E7=BB=84"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 100 +------ Pages/客户/客户信息子页面.json | 45 ++- Pages/客户/客户基本信息.json | 77 ++++- Pages/客户/客户管理.json | 462 +++++++++++++++++++++++++++--- Pages/客户/客户详情.json | 6 +- Pages/客户/客户部门管理.json | 337 +++++++++++----------- Pages/客户/客户部门管理.rd | 2 +- ServerCommands/客户/删除客户.json | 94 ++++++ Tables/客户/客户分组.json | 53 ++++ Tables/客户/客户表.json | 192 ++++++++++++- Tables/客户/客户部门表.json | 8 + 11 files changed, 1049 insertions(+), 327 deletions(-) create mode 100644 ServerCommands/客户/删除客户.json create mode 100644 Tables/客户/客户分组.json diff --git a/.collaboration b/.collaboration index 0176a6a3..5f0b6035 100644 --- a/.collaboration +++ b/.collaboration @@ -124,29 +124,11 @@ }, { "ModuleName": "Table/客户表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T15:13:50.0427342+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\客户\\客户表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/客户部门表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T15:25:08.7595867+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\客户\\客户部门表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/工时", @@ -772,73 +754,23 @@ }, { "ModuleName": "PCPage/客户管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T15:16:50.2833224+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\客户\\客户管理.json", - "Pages\\客户\\客户管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/客户详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T15:18:22.8765432+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\客户\\客户详情.json", - "Pages\\客户\\客户详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/客户信息子页面", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T15:24:13.9196316+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\客户\\客户信息子页面.json", - "Pages\\客户\\客户信息子页面.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/客户基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T15:23:38.7813368+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\客户\\客户基本信息.json", - "Pages\\客户\\客户基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/客户部门管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T15:25:36.9408914+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\客户\\客户部门管理.json", - "Pages\\客户\\客户部门管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/汇报", @@ -2346,32 +2278,14 @@ }, { "ModuleName": "ServerCommands/客户", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T15:14:48.7447622+08:00", "ModuleType": 20 }, { "ModuleName": "ServerCommand/删除客户", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T15:15:11.8459282+08:00", "ModuleType": 15 }, { "ModuleName": "Table/客户分组", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T15:22:33.8204564+08:00", "ModuleType": 7 } ] \ No newline at end of file diff --git a/Pages/客户/客户信息子页面.json b/Pages/客户/客户信息子页面.json index 761ae89c..7e3c8937 100644 --- a/Pages/客户/客户信息子页面.json +++ b/Pages/客户/客户信息子页面.json @@ -199,7 +199,7 @@ "6,1": "客户税号", "9,1": "客户名称", "12,1": "客户地址", - "15,1": "邮箱地址", + "15,1": "分组", "18,1": "部门经理", "21,1": "部门经理", "24,1": "项目数量", @@ -237,8 +237,13 @@ "16,1": { "BindingInfo": { "TableName": "客户表", - "ColumnName": "邮箱", - "GUID": "bd0148ae-300c-487d-b8f0-5ea5cb098c89" + "ColumnName": "分组", + "GUID": "dbe96a55-cd9a-42ad-90ec-1f07722ea3c6", + "RelationBinding": { + "RelatedTable": "客户分组", + "RelatedColumn": "ID", + "DisplayColumn": "分组" + } } }, "19,1": { @@ -331,12 +336,40 @@ "actionButtons": [ { "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], "type": "button", "Name": "编辑", "shape": "default" }, { "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], "type": "button", "Name": "删除", "styleType": "Accent 5", @@ -630,7 +663,6 @@ }, "Spans": [ "13,1,1,9", - "16,1,1,9", "19,1,1,9", "10,1,1,9", "7,1,1,9", @@ -638,7 +670,8 @@ "4,1,1,9", "22,1,1,9", "28,1,1,9", - "25,1,1,9" + "25,1,1,9", + "16,1,1,9" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -675,4 +708,4 @@ "Size": "3,18" } ] -}//g2sAzhP1DHGvwPXQ38m2qlsVrqQurG81upVeJ5iDOYdcC9rZtS7m9MZjso2mPydksGTdjWRCtRQi7hn5SwRqbcinknqrK5/B97R8n16EfejQUXF2uacaCYOHd7U6T6zc0bSIU7Zf4+ukqDDxxbqP1VawGyh8KaGhtrr2cFbSwEYFbFAPHhV7d6y16GQy1DqjRkuwS2jDCFRArs9npRtGFocgwJ2Px1NxABJUt++W1oPZabRk49CI7JfUp6lTchIrspZ3gBG58lLPbWNZpZJx+/+wvoykIA5aA2sn1OMQRO73uqoWHUw3yE7LpYOC/62zMOevpL87CYNlRGjHucWEeiNHwsls4FoQl0vtS50si+49d+SwJfBWKBcjIrjLsraNCXkxA1Hy63Ud/Qf/knyjpj+HTWSd0E6vJEC2mnstQKY5rTpvUT+eqbSw67njwpN8yVNpuiqzn6gW+8nuEoop8sGEQjMEsEvSPbYlX9LhpGER3JAKSOMsraEnJrbemjJASTkU6FSGTcG/SXVKRETC5288RzRtYQTO/xe0zXhHDhOCXGK8+G7TGKSRwADLMJ3lnl2+cSjVybk4umQJ2RFg4xfd+KSFMqVPs0kVrolJLSEBg5DQGwpEU6RzyXLWmn6X940TI3tzEpGCtL6FLyn77UKYaPoV6ShKYlHwAlhxKieGhCUBLuABbvk+ZouJeM8MkcECxXv9ZmNxHtkpeMSvPHFkdthkQWnhc/ab84sgMyzuv+nFg+bYhwwhq/+DR0IwWW0RB136ir0iZY7eicWGz1KOKvdWGdLK/frfrKDOs6XtpM+aXNPVQfj7sENw+qPOmCcJ8XyNxrdshouDaKeizNi49PMXth9i/VtaQdFQIBz0DteOrw37sIebb/CcSdM6NAjp7Ay7qhzKx49Hi7nscQ==|920 \ No newline at end of file +}//RZqmbPiio3vwcaKfv7bBon2kmJ58If82XqUdMI9D7bUWJWeia43h30h5Wrlt9JvBVf/qinoD8PiHH1ApmLjMIISsmDPkax44JKx92zzMkBLpFcmohCVouh5vBHq0uQ1QpxXKBtt75RTivl7+sD1oiBnTloqO/u9PFIgi+yECi/DavW7LBsZH1wInknt/yEdqdwHFcBurP9dC5OZuOHV8SobaQOkpEcyb4dMuTHlHJBXMfsgYYINFyZHCjmXGnQHYiP1w4X78mLFaXj6xzIX9uqSpMXS1izI/xHdxxj1DqMMDTQMypTyaVP13Bvhm8FmHGYNQ9uEeUFMtnZwrHlMWjqsSR9MakGzaBCQByApQOeWxoHvT5U31lPEcpARPhphO5H5UFpAu1A+eQHhSfLu1NSlkb4HPuAdHoghApEwBgyQaQ4k3sIBfJ0sa0SWE0t6CXZkYbpZDuako6nr/duVT8lRkiUcJyxhIwMtnkA5Zf/20QcUBMZYX466+dxpKI7QZ9Jb8viK4cEhURb19gqfL8XXW+gpo77RE9wzlaW5UNPb04zy5sv94SmNjc5TO9XuSVeji2coO5uNzEpO/o2mqpfwCyQebpx8G8HCGJC6SYB9RK7/5wrY0rUrlbIBL39QVvER5OTlfuIoibFYAVB0+Di+fiY4r5wATO+t+caCiKOW8BjfxAmvOzlpby+KlWQvjp63w83WeRJ5ky7fTmxPBorDpZm9n0y3TAfcNw9Q6YLP81fcbvaPcOu41zqt9Qdjv9e3O4FSfPk505UdB9FmfIRiKrzWjiQnH7BTl/Pyopj5Mqg1YBWFgG9LX2L0KYhvMLOTD/3xYcR9F7h/fxPPmRCEWQ9NPwcTxtamWx7yCiBZIN2Kb53YRcPVDA1icUX5Bfqd27yxuNQSRzioCNsl3HA==|920 \ No newline at end of file diff --git a/Pages/客户/客户基本信息.json b/Pages/客户/客户基本信息.json index edc6e9bf..9a0aacbc 100644 --- a/Pages/客户/客户基本信息.json +++ b/Pages/客户/客户基本信息.json @@ -232,7 +232,7 @@ "1,1": "客户名称", "4,1": "客户税号", "7,1": "地址", - "10,1": "邮箱", + "10,1": "分组", "13,1": "客户经理" }, "AttachInfos": { @@ -341,11 +341,11 @@ "11,1": { "BindingInfo": { "TableName": "客户表", - "ColumnName": "邮箱", - "GUID": "1a41242b-4902-4a38-be96-d0b9f5902766" + "ColumnName": "分组", + "GUID": "97756374-3f49-490e-8110-88ef043c5820" }, "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", + "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], "UIPermissions": [ { @@ -359,16 +359,63 @@ "AllowRoles": [ "FGC_Anonymous" ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] } ], - "type": "text", - "resize": "none" + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "客户分组", + "BindingInfos": [ + { + "GUID": "408b4878-f65a-4661-a951-3d29b96cf8c5", + "BindingInfo": { + "TableName": "客户分组", + "ColumnName": "ID", + "GUID": "de1bf911-dcf9-416d-99ae-b33598c702a6" + }, + "ColumnName": "value" + }, + { + "GUID": "2dede713-f717-4be8-8f98-388c0d16ba23", + "BindingInfo": { + "TableName": "客户分组", + "ColumnName": "分组", + "GUID": "c1406c5b-0dae-40de-892c-8d382f92b45a" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" } }, "13,1": { @@ -610,9 +657,9 @@ "Spans": [ "2,1,1,24", "14,1,1,24", - "11,1,1,24", "8,1,1,24", - "5,1,1,24" + "5,1,1,24", + "11,1,1,24" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -638,4 +685,4 @@ "PaperSize": {}, "Margin": {} } -}//se+bUNkh7zvJS+3DEQZYWlrtxW+OMyEuhMBj9XpW0Swll9D5YPIBB/HAFXY68IN5Q47p3W7Gd7y2+J3gih3C1wTF4H4cDvL4FmaH/LY8OZRgHYlgqpolL8NPZHG+oYnTZ5kQUnJijpKXQf5WD3EVOOIBxwPwXGe2G/gQx8wLlp1MAVEm6tDUUsJsedhOeyXmLJXU900vJuIL21rHn2+51CS2gPznpuaZZ7NaCQeXyiicu/Si1GbWQV2EYOsVJ5+ZPdkO/Ep2k4syz3iH4Gwox7qvYjgjT31x6mQkM+st8f/89nU7VjqEgTyAQpWwsbc8X//KF/oIy3iSrN8FS83KiMpd9CzkSLHCEewFaS3DVCSKMGzt5SdIs36nFI5S6cnilcTcBYiRAkW+HGeEmR8n5pdTINtJXBrSedDbk1+amsl/A6VOxplF6w0TY9sj2PXfr442XOkbOaXmZovb2uzSrr8da7Y7d7I15m6bm3RdbMITURfZ+mPA035CihojGc6uG3IGH+UgXnY1/BKO4fncp8+6HJOW6ExU9LZ0Q4bmVocuiLalJw7XGzBVQQTCwRBTt2L/J4sUmvuqHeQAXFjT7O16Dh14OcGjQnxlS1VES5BUbEdDpt6YkMzd+Plkw9OA9y4/OPuFmzb42dSh8mEK0JTAQZKZ1OIEfRCFhh31QMZH++d00viUu0+BgvLxKUFrQ3K+FhZ4ejcov/fhHjHa3UCJb/tCae0F6i/9KzYuZaYsiE/ps4HevBzwb5ys9L5PsD/Fq0vP2WOLifNkIPVDO/CHG1I2VY+GtjZD2P2BIkl/nCRCFGy5lGjjxQEfQgY6+jxOcmNpyt+EfmiuE+/JllryaZEkCOVRRxqrAYZD4U13m7w7tq4Wn56WB5y/fHkJl35DvhPw451rg2b296iKMg==|920 \ No newline at end of file +}//qBFpVkN3sIVfxiQVrPs43Kt/tYrf28IjcxBgYeq436pQlk4kSeRqUdOnNGWpugB0xrd0AFEFRnRi0eLT97wtGlmiqQrfzmqTe1EkBLcU0SKI+5Wzb9ggEMNGZYW7reVWlj8XzL+sfyFfT9SUDZ3v+cf+TYmaFa6zR0FD3zlMPF/kFnroz1rSXoPzHaMY7adlMu6M5HzUZX5WjcrXJHq5STWIseRVKN2kBXbGydf/g4BfSGMbhfx/OevXyZQkQBU7cx9a2OMlbfikDwzrA/AdReHa6PAoYOvv0+TMbtoE4FKC26XkB11XtaU9+du9ddJTHCB9/dMPmCQQBInIyzw9wNAlDonM6hkE0brKpWOpGx4Z5ZGqJBL6l6KfWd+T6zHjYy7Q2j3LP5k45vlQYocqlknSGL8wFQ6j/Z7KOLCqHbrO8CfRbGFC4YQW2Lfcxu8DM8Rc+NlTYX3tLP5JHhurDw5dPUuiw9bXZPfDknpxxP37PAy0v8jVPnfYT3RhX7teIT9SiXvqCZ598fVHDeUQaSxWZ9epILUEapv6gYe4GtpGglBYqFbpIwlmEjbIGxc/ElqEq/T+tu0faTKF5o2JqFWGPbf/uF64DnhIcUrrGAR/SlN22cTuXjqYwxRPEV5SRBlGPR8C/8cnRYDdS4cH4fpPkbh6KQCy826JG/HAZa0MpVbqzLfUWsdg+n4IJkM0dhvGcZZtsKKTK5F/OPQ839S+B5Y5N8kCwHNYkB3IWBcPmeOOd1JqZTY39I2TzMlkK+li9o2X+Mu1TCv24WKL+LGjzCVHwzVqzuFb5K5LuCvV4+IqWjI5KWX/izEqH7jO79nFLflgWO3lKNL3Mu+mJCH+ocM47w1LnRajhl09ZR/IhRw8pqNteXlV+IoaHEemveTRcVrWXEJqS5X8ip+ejQ==|920 \ No newline at end of file diff --git a/Pages/客户/客户管理.json b/Pages/客户/客户管理.json index 489804b5..dcda6c66 100644 --- a/Pages/客户/客户管理.json +++ b/Pages/客户/客户管理.json @@ -413,7 +413,7 @@ "1,1": "%PageTitle%", "1,31": "客户信息子页面", "3,1": "关键字", - "5,1": "税号", + "5,1": "分组", "5,16": "负责人", "7,1": "查询", "7,4": "重置" @@ -498,7 +498,7 @@ } } ], - "ID": "c1edbc47-1acc-4ea5-b1fe-a2430fcc377d" + "ID": "4314a155-3db2-4433-bf50-5d22b787a8d5" } ] } @@ -560,13 +560,13 @@ } ], "type": "text", - "placeholder": "支持客户名称、地址、邮箱", + "placeholder": "支持客户名称、税号、地址", "resize": "none" } }, "5,4": { "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", + "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], "UIPermissions": [ { @@ -580,17 +580,63 @@ "AllowRoles": [ "FGC_Anonymous" ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] } ], - "type": "text", - "placeholder": "输入关键字", - "resize": "none" + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "客户分组", + "BindingInfos": [ + { + "GUID": "32f0c2a8-3239-40e9-bf34-34447349605d", + "BindingInfo": { + "TableName": "客户分组", + "ColumnName": "ID", + "GUID": "86720105-c0cc-4525-b197-a7929198035d" + }, + "ColumnName": "value" + }, + { + "GUID": "fb78aa1a-ad55-42de-801f-547fa52bb994", + "BindingInfo": { + "TableName": "客户分组", + "ColumnName": "分组", + "GUID": "8571bd4a-7fb0-4d9b-97da-ff26b223b68c" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" } }, "5,19": { @@ -806,7 +852,7 @@ } } ], - "ID": "9ce8a30f-fb43-4f0f-9d70-aaad44c46aa6" + "ID": "60fd2491-dab0-468c-b205-81e17d4b0bfb" } ] } @@ -872,12 +918,91 @@ "GUID": "a7cc5a3b-566c-4b9b-ac09-d1c490581d44", "BindingInfo": { "TableName": "客户表", - "ColumnName": "邮箱", - "GUID": "b7a012e3-3d6a-4484-b745-31c0cb4d92fb" + "ColumnName": "分组", + "GUID": "0d3bf12e-9360-4139-8179-34a8c4a094a8", + "RelationBinding": { + "RelatedTable": "客户分组", + "RelatedColumn": "ID", + "DisplayColumn": "分组" + } }, - "ColumnName": "邮箱" + "ColumnName": "分组" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "客户表", + "ColumnName": "删除", + "GUID": "c799c6cc-42a5-4200-8ea9-ff600d09383d" + }, + "Value": "1" + }, + { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "客户表", + "ColumnName": "客户名称", + "GUID": "b8b8ae65-2702-4f5d-8ca3-c114d157303f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户管理!E4" + }, + "LeftBracket": 1 + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "客户表", + "ColumnName": "客户税号", + "GUID": "47cb22a5-b2bc-44e6-935c-7f454b5cb241" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户管理!E4" + }, + "RightBracket": 1 + } + ], + "RelationType": 1 + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "客户表", + "ColumnName": "客户经理", + "GUID": "0ca3c81b-3e61-42c1-a9b8-92759fccd122" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户管理!T6" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "客户表", + "ColumnName": "分组", + "GUID": "06cac1aa-03c0-473c-8cd4-31fd497a660a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户管理!E6" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 1, "OrderBySqlCondition": { "OrderByColumns": [ { @@ -903,9 +1028,20 @@ "align": "center", "headerAlign": "center", "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", "resizable": false, "hide": true, - "key": "1f09a71b-598c-47f0-b9f2-cf89f328d1d3" + "key": "1f09a71b-598c-47f0-b9f2-cf89f328d1d3", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] }, { "$type": "ElementUI.ColumnSetting, ElementUI", @@ -915,10 +1051,21 @@ "align": "left", "headerAlign": "left", "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", "filter": true, "multipleFilter": true, - "showOverflowTooltip": true, - "key": "2d7515df-edb9-4559-bf4a-251b90bdbb9b" + "showOverflowTooltip": false, + "key": "2d7515df-edb9-4559-bf4a-251b90bdbb9b", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] }, { "$type": "ElementUI.ColumnSetting, ElementUI", @@ -928,10 +1075,21 @@ "align": "left", "headerAlign": "left", "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", "filter": true, "multipleFilter": true, - "showOverflowTooltip": true, - "key": "45746e6f-369f-4d36-9723-f89d604c9b49" + "showOverflowTooltip": false, + "key": "45746e6f-369f-4d36-9723-f89d604c9b49", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] }, { "$type": "ElementUI.ColumnSetting, ElementUI", @@ -941,29 +1099,64 @@ "align": "left", "headerAlign": "left", "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", "filter": true, "multipleFilter": true, - "showOverflowTooltip": true, - "key": "4f5be512-0f2f-4d94-a5d6-6491c7186d68" + "key": "4f5be512-0f2f-4d94-a5d6-6491c7186d68", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "邮箱", + "dataColumnName": "分组", "sortable": true, - "label": "邮箱", + "label": "分组", "align": "left", "headerAlign": "left", "colfixed": "false", + "type": "Tag", + "tagType": "info", + "imgType": "cover", "filter": true, "multipleFilter": true, - "showOverflowTooltip": true, - "key": "38bdec15-07f8-4af0-926b-435d3823d86d" + "showOverflowTooltip": false, + "key": "38bdec15-07f8-4af0-926b-435d3823d86d", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] } ], "showActionButtons": true, "actionButtons": [ { "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], "type": "button", "Name": "详情", "styleType": "Accent 1 0", @@ -1021,7 +1214,7 @@ } } ], - "ID": "561a2838-914f-4741-a639-79245c132402" + "ID": "51791c2a-bfc5-4d26-a68c-c71fa775d6ea" } ] } @@ -1041,6 +1234,20 @@ }, { "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], "type": "button", "Name": "删除", "styleType": "Accent 5", @@ -1049,19 +1256,186 @@ "$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": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "标题", + "Message": "是否删除该客户？", + "Type": "warning", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "按钮结果", + "AdvancedSettings": {} + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=按钮结果" + } + ] + }, + "value": "confrim" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目数量", + "TableValue": { + "TableName": "项目表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "所属客户", + "GUID": "2ca00b1a-94aa-4668-9f03-c115f720f746" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户管理!行数据.ID" + } + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "87d10f3d78504c60b6cdd1818f9c3e85" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目数量" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "客户表", + "UpdateType": "delete", + "ShowConfirm": false, + "ReloadAfterSucceed": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "客户表", + "ColumnName": "ID", + "GUID": "0df6010f-d1eb-4f9a-9cce-20c32fb08b0d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户管理!行数据.ID" + } + }, + "NextUpdateDataTableCommand": { + "TableName": "客户部门表", + "UpdateType": "delete", + "ShowConfirm": false, + "ReloadAfterSucceed": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "客户部门表", + "ColumnName": "ID", + "GUID": "fa576f7b-ecd7-4263-9fc2-0085cadd075c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户管理!行数据.ID" + } + } + } + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "已删除成功" + } + ], + "ID": "c1f73417-6446-4f8f-8bc9-f17ff56f556d" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "客户表", + "ShowConfirm": false, + "CheckDataValidation": false, + "ReloadAfterSucceed": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "客户表", + "ColumnName": "ID", + "GUID": "0df6010f-d1eb-4f9a-9cce-20c32fb08b0d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户管理!行数据.ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "客户表", + "ColumnName": "删除", + "GUID": "e28fc907-efdc-4c1f-bfd1-53b183e17276" + }, + "Value": "1" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "已设置为删除标记(因有项目已经使用)" + } + ], + "ID": "c8c9efed-b002-4b23-9738-a60343b8ea6f" + } + ] + }, + { + "$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 + } + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + } + ], + "ID": "5f2e9a6f-9f4d-4d30-95a7-ddb4117b2eac" } - } + ] } ], "ParamProperties": { @@ -1413,7 +1787,6 @@ "1,31,26,10", "7,1,1,2", "7,4,1,2", - "5,4,1,11", "5,16,1,3", "30,1,1,4", "3,1,1,2", @@ -1422,7 +1795,8 @@ "1,18,1,12", "5,19,1,10", "28,1,1,29", - "3,4,1,26" + "3,4,1,26", + "5,4,1,11" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1466,4 +1840,4 @@ "Formula": "客户管理!$B$31" } ] -}//yXnG9qp/u1341l7mFxLUUBZhGMU2NJpG43pns0qRFSLxXclZxoytENUE/VT1rxbwsTf0P8CXr7oR5pA7j5+CrhZh2saMwfSdVaV2GTV7xkj6ScwTsTJ+UOUBpCJmxLOWd8fMIhTRxOi0yAvVGh5XkWEROwr9Cscvg9n229A3YLkxAgvibxwhKrL78mcOr194FS+6P3cj8AweHDhQONpkCkRdIzs06Yb31zyvLERnO/pBYXeF2ubsPb4Ya+C6rCK1CS4HlO7bfPPKzDYxynAY9WSf7to9fNK4mwkcodiCyJK3Y2pznlWYIuViS1TLJsrPmm1B+a+MxSrNc8TlzS+/mcMTv1b1dKFmazBxkHWeZBehEld3yMCRc8gHjFgoK/e5L7R04GMouSf2dCek1sWmZo/aOHJUQgKM03ml/JrpeckuadwZO4CqgY62sSF30bdy7EEb7mA7LfJaFHV/rVdhW8fHSzttiKIzFoDA5Hkq5Wb/LU1g51A3z/Mho2hLwuedyQGSw5E9P6sO6ys0iYw8C+xR9qBJABtVRN0thTyV3LghkqzXVNzObdT9X0b3DVIVPr8iGAe8h+VOvOxR4h0NG6Ef6BQZ0v+ebLIlJWzzitIp/5n2tH7d1oUSpmKrCLNCce+xQgiVEzBTrIjUPTe6fQVCTiuGv5v+AamIZzpW1oMUzT+EpVR43djP0EDvKfTyWMheGYMpM5+mLSUXrucQTBiG/odhGxegfWCysa6gQu+FqL1srzRhYKP8typ4HUFlfM0MLeYwelnUHvB0ljLmf0HpFUSGd32P1d4ianGcybb8806+nrMr7lUveHhMi4m2Ovl139WqLVb+1RirLWgvEFa8GTfflyDGX5LyOCScwyxXOboh1qbw0H3xpxnDQ9QPJxv6YSRt6eYd3bE0XdNodA==|920 \ No newline at end of file +}//rKFC8jUeoC9QNFrdc93ZWVABSciVJIEeUx22wWUPTU66NKDtykYuicPDAxlrvuwXs0sM4SjFyutRx44ObQ+r8q++5dMWBGu075itHK/YyGw1PQOAgfMtAR/Ou2WivUGF+s89hKTqzuZAHla1i8yF1szhP7spDOxZ7aXkRR7uIX0qseND7f6u7R7FsWk59xhCLBXIpwmOYYVYOgMUwikoZUpaezmQfDm978Se2igc3jwJ5xj9xOG/WFYHalOwqBNaQ34MDjSQP70ok3SXEm+K/J7FSERwiS3vf1metoLJjtKVRMEZrVHm3meCHRuLDQ8HkSZU2EijQu2pshHBarTR2uKDIm5vqJlENuW87VCv0QlYvQ88dz5ukol713sBCaZLYWX2p3f/v9t7JhWQz9Fgpb0ZSTz+uToJcxSD+wFEWG5Yj5mRj2tVKP9ZMn1Txnb/9SfuLr78xMsLThIua5kzW2+eau4yGOU+iZKtsYByhnMoBBtlrLBw1TRsmwG9QrcOgCnJTHQkks4vFWF7MtZADmIrfcc21OL0QSvmh+heDsRETzqglmOKD/UMokWZ1eNa2OsBWbdoaovIArKdYD2n0tf1blZZlKjFrgrPS9LiioUMl311BP+aMP03cKoWF/y5II5mPrX9IyzWSP3vN5Aq+UxXj1AjaHvHN/uCzqLw3ad/FG3arxZOAhCp4t5xx7VhxGL9S4VJe7Qs8W+kcv12POAnMVx+9M5AB42KATwIBVwEKElH7asVZMUJ1D3lyAI3ar9twWK/Zr6Aeyy3WflCtrlrhZanaaAVNI6mSmbpTLq1humpiDvZsiPuhdskKACRZB5QgGzW/oJgneEABCuhnmyfpTiMTm4pFMI/rxOw36MhtpPGaqYs+Rxh8rYzoRiao0GSqyxwkgylhmRXZOm70g==|920 \ No newline at end of file diff --git a/Pages/客户/客户详情.json b/Pages/客户/客户详情.json index 8360cf75..eaecd3e8 100644 --- a/Pages/客户/客户详情.json +++ b/Pages/客户/客户详情.json @@ -233,7 +233,7 @@ "ShowConfirm": false } ], - "ID": "37bdb8a6-3746-4e08-8120-e99d6ebecf06" + "ID": "57c41556-95b0-42ba-a73f-b3f2a50e6439" }, { "CommandList": [ @@ -243,7 +243,7 @@ "ShowConfirm": false } ], - "ID": "44155bee-9763-481b-9259-ff73266c35ab" + "ID": "843fa83c-cecc-4bd7-818b-e1f3c5d00560" } ] }, @@ -332,4 +332,4 @@ "Formula": "客户详情!$B$6" } ] -}//9goCSkpClROLOhr8SC15zVOcC9cnGwz20wHpqVjn0M5eZXnOAbDJpIZ9ibHcmcnwN8vDFRpACkFY1pT+hZQXZmlTYqGaVHAg13JLhrDy1LPy9Ez6Z/REYME3SfXQt2AlJ4xW3crkFgaEk4+Gtr6pziWODVf/2BGK/BFB80uMPtbZXCnTslKV8G26QTCOqq/cBsRRYfrEQQGpNlRPnvmyTwsKQrC50MywfoQqkHW+I3A63a8rd0xsmLVy5YzoSV6rLxHhUtypT5j6gorZ69OGOX2kwLGPfx7PdFg1Z4lGyuDNTrFmlg4sQp0OhQSn/E/K5cyLzUiXr+FjvBwMxB1fCAY+B0e7+gp70OLzQ5Mfif6eL4sPCpvSOIh8Pu4FLGD8D9QRpnwQVrsvXQ95Frvv1xjl7gyyUrRbI69nAaV/G+K/EJF6RBzzpCdVHyyHCXY3dth1feHVdtFQHS9CQ5NB1fRMmjHMJUJVIg0v1pSm0u0ltPDpJV+JrJ0x8pjX2YJlHV8r7HJkznG1jY31Ot62mDehC3+metPxROX++tu2f9pmNcwbkc/iR3s2J3Qt0zb+VVKNK4MGTHoAZo5mDmWzncngFnainyc6ShDBNyInHQoR6ievyXgYfgtFwJcYdLZML6zMdUKuPcCvwDICFXWAKRDN7GTqFEDTj8Om5Ff2UD1L7E2ECdrrF0tZjJlpAy6KpqTNxfsRS4diavsf2p8+FQFtFCM+k/Cbomh8kdm2bVHOfSjXKxiAzZB5dBee9X9FXoFqRGPBrYe5FoBltU3Lq9jp7x4QzaDVQ4TVRJx8MISY10LSLk94F/2oeLbFo4SE46tOaUiu9p3E6SOfzso13Qhd7up6FzlulQfdBMPjNtsOkQc1dnaDe/V4Ur+e31W1Oesy15VcpFHYirG+jqRl1w==|920 \ No newline at end of file +}//XLdEQH3KLainOuflZzzNaFhwlWGmKZe5uWeTap5Si6DmwP8n3+WFfoh5qt5bmHReTarkixfMPYvIcbNzX/w5AkSy3JhQD/YdPUIsujBv+hOLjsu3urW4LPvXtrv1LPl9EhgiGf/U2vQXzoWttY5hlJfHcF4U7DcSlFwoHsgW273U0iXjk5ndGcOavtmMRroUs1sskxyjjD1ZmN9b35crPfnZAwnSiG2XbjAhv+xSXytrQkayngmSWBE6YLy8p1beNv6UIeMKeW34x/0ttB0DomTxlKt1c3S4g61rHG3ijarF0cxyBKd4BJuFaTLBzZJ+mczvyJkZZpP1fE+mV3YNHm9KOOJUuawpHVj96w5UTsv2+6+0XCzqP7q3q9k54FOYn5mU9RHhCXLmMYXmQYJPAxzlMcnY74nfDpianoYqkCnrykConiChi2E9HKm2DyCtDRKSppIHoNYzC1ZQvDhlfKBSLBRkPwqOTAWH6FvMgUjK4pUkRBGE+mNJ0TjgVDqcBiokbWeKqIr4FoFMpaS4wKweHkNRbkgOAUSeouy1z5IBvMAxOKOmj5wrUTKFRZz+F4E8BR7u9KH2Km9lezmm0MBPHkhS2vljA2oWf3sQ2uA3BMvWKC8nJDA1GVavidKhqu07IsFoQ6Jceryj6bVbDRQsIBXlvElkI3Y19gHg3hZLswSgiVdvJub1a3EBZsuG7xAsLtpS0jAQEkouRdGx+NcTEPPk/6vfhTk8djb+Cb0i7cK68JG4/cfupp7g8lm4er05yBg72CIRCUoF7Z/h3COnpvdN91ytfYPEBcBVoKbywXSvZcyboP/K8I46V24DpBHAUV0RILMTSQTWv0gEVFfjqNn/ImTQp2TnNaujji2hPTZJhMAp76qO6kiIrVASG5eFU019eoTkGYHrV+wJLg==|920 \ No newline at end of file diff --git a/Pages/客户/客户部门管理.json b/Pages/客户/客户部门管理.json index a8bbfbd8..1cf9c79f 100644 --- a/Pages/客户/客户部门管理.json +++ b/Pages/客户/客户部门管理.json @@ -174,36 +174,6 @@ "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 - } - }, - "22": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "23": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -220,17 +190,47 @@ } }, "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": 32.0 + } + }, + "32": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } } }, - "Count": 27, + "Count": 33, "DefaultSize": 32.0 }, "Values": { - "1,23": "操作", - "2,23": "删除" + "1,29": "操作", + "2,29": "删除" }, "AttachInfos": { "1,1": { @@ -240,7 +240,7 @@ "RowIndex": 1, "ColumnIndex": 1, "RowCount": 14, - "ColumnCount": 25, + "ColumnCount": 31, "DetailListViewInfo": { "ColumnOfDetailTable": "客户ID", "MasterTable": "客户表", @@ -313,6 +313,14 @@ } }, "2,17": { + "NameUsedInJavaScript": "电话", + "BindingInfo": { + "TableName": "客户部门表", + "ColumnName": "电话", + "GUID": "736975e3-c07e-4537-91fd-6fc2e2b902e9" + } + }, + "2,23": { "NameUsedInJavaScript": "对接人", "BindingInfo": { "TableName": "客户部门表", @@ -335,7 +343,8 @@ } } }, - "2,23": { + "2,29": { + "NameUsedInJavaScript": "操作", "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ @@ -380,6 +389,10 @@ "Formatter": 4, "HorizontalAlignment": 1 }, + { + "FontSize": 13.333333333333332, + "HorizontalAlignment": 1 + }, { "FontSize": 13.333333333333332, "Foreground": 5, @@ -414,145 +427,149 @@ "1,6": 0, "1,11": 1, "1,17": 1, - "1,23": 2, + "1,23": 1, + "1,29": 2, "2,1": 3, "2,6": 4, "2,11": 3, - "2,17": 1, - "2,23": 5, - "4,0": 6, - "4,1": 7, - "4,2": 6, - "4,3": 6, - "4,5": 6, - "4,6": 6, - "4,7": 6, - "4,8": 6, - "4,9": 6, - "4,10": 6, - "4,11": 6, - "4,12": 6, - "4,13": 6, - "4,14": 6, - "4,15": 6, - "4,16": 6, - "4,17": 6, - "4,18": 6, - "4,19": 6, - "4,20": 6, - "4,21": 6, - "4,22": 6, - "4,23": 6, - "4,24": 6, - "4,25": 6, - "4,26": 6, - "5,0": 6, - "5,1": 8, - "5,26": 6, - "7,0": 6, - "7,1": 7, - "7,2": 6, - "7,3": 6, - "7,5": 6, - "7,6": 6, - "7,7": 6, - "7,8": 6, - "7,9": 6, - "7,10": 6, - "7,11": 6, - "7,12": 6, - "7,13": 6, - "7,14": 6, - "7,15": 6, - "7,16": 6, - "7,17": 6, - "7,18": 6, - "7,19": 6, - "7,20": 6, - "7,21": 6, - "7,22": 6, - "7,23": 6, - "7,24": 6, - "7,25": 6, - "7,26": 6, - "8,0": 6, - "8,1": 8, - "8,26": 6, - "10,0": 6, - "10,1": 7, - "10,2": 6, - "10,3": 6, - "10,5": 6, - "10,6": 6, - "10,7": 6, - "10,8": 6, - "10,9": 6, - "10,10": 6, - "10,11": 6, - "10,12": 6, - "10,13": 6, - "10,14": 6, - "10,15": 6, - "10,16": 6, - "10,17": 6, - "10,18": 6, - "10,19": 6, - "10,20": 6, - "10,21": 6, - "10,22": 6, - "10,23": 6, - "10,24": 6, - "10,25": 6, - "10,26": 6, - "11,0": 6, - "11,1": 8, - "11,26": 6, - "13,0": 6, - "13,1": 7, - "13,2": 6, - "13,3": 6, - "13,5": 6, - "13,6": 6, - "13,7": 6, - "13,8": 6, - "13,9": 6, - "13,10": 6, - "13,11": 6, - "13,12": 6, - "13,13": 6, - "13,14": 6, - "13,15": 6, - "13,16": 6, - "13,17": 6, - "13,18": 6, - "13,19": 6, - "13,20": 6, - "13,21": 6, - "13,22": 6, - "13,23": 6, - "13,24": 6, - "13,25": 6, - "13,26": 6, - "14,0": 6, - "14,1": 8, - "14,26": 6 + "2,17": 5, + "2,23": 1, + "2,29": 6, + "4,0": 7, + "4,1": 8, + "4,2": 7, + "4,3": 7, + "4,5": 7, + "4,6": 7, + "4,7": 7, + "4,8": 7, + "4,9": 7, + "4,10": 7, + "4,11": 7, + "4,12": 7, + "4,13": 7, + "4,14": 7, + "4,15": 7, + "4,16": 7, + "4,23": 7, + "4,24": 7, + "4,25": 7, + "4,26": 7, + "4,27": 7, + "4,28": 7, + "4,29": 7, + "4,30": 7, + "4,31": 7, + "4,32": 7, + "5,0": 7, + "5,1": 9, + "5,32": 7, + "7,0": 7, + "7,1": 8, + "7,2": 7, + "7,3": 7, + "7,5": 7, + "7,6": 7, + "7,7": 7, + "7,8": 7, + "7,9": 7, + "7,10": 7, + "7,11": 7, + "7,12": 7, + "7,13": 7, + "7,14": 7, + "7,15": 7, + "7,16": 7, + "7,23": 7, + "7,24": 7, + "7,25": 7, + "7,26": 7, + "7,27": 7, + "7,28": 7, + "7,29": 7, + "7,30": 7, + "7,31": 7, + "7,32": 7, + "8,0": 7, + "8,1": 9, + "8,32": 7, + "10,0": 7, + "10,1": 8, + "10,2": 7, + "10,3": 7, + "10,5": 7, + "10,6": 7, + "10,7": 7, + "10,8": 7, + "10,9": 7, + "10,10": 7, + "10,11": 7, + "10,12": 7, + "10,13": 7, + "10,14": 7, + "10,15": 7, + "10,16": 7, + "10,23": 7, + "10,24": 7, + "10,25": 7, + "10,26": 7, + "10,27": 7, + "10,28": 7, + "10,29": 7, + "10,30": 7, + "10,31": 7, + "10,32": 7, + "11,0": 7, + "11,1": 9, + "11,32": 7, + "13,0": 7, + "13,1": 8, + "13,2": 7, + "13,3": 7, + "13,5": 7, + "13,6": 7, + "13,7": 7, + "13,8": 7, + "13,9": 7, + "13,10": 7, + "13,11": 7, + "13,12": 7, + "13,13": 7, + "13,14": 7, + "13,15": 7, + "13,16": 7, + "13,23": 7, + "13,24": 7, + "13,25": 7, + "13,26": 7, + "13,27": 7, + "13,28": 7, + "13,29": 7, + "13,30": 7, + "13,31": 7, + "13,32": 7, + "14,0": 7, + "14,1": 9, + "14,32": 7 }, "SheetStyle": { "FontFamily": 2 } }, "Spans": [ - "3,1,12,25", - "2,23,1,3", - "2,17,1,6", + "3,1,12,31", + "2,29,1,3", + "2,23,1,6", "2,11,1,6", "2,6,1,5", "2,1,1,5", "1,1,1,5", "1,6,1,5", "1,11,1,6", - "1,17,1,6", - "1,23,1,3" + "1,23,1,6", + "1,29,1,3", + "2,17,1,6", + "1,17,1,6" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -577,4 +594,4 @@ "PaperSize": {}, "Margin": {} } -}//OSuiqqqdNjah2Nh3dU1MFPLnnB/uMht9FXBcRcgn6B/OxpuJnwk/9TcTwJ6nwiqkDrUndKRe3eTaYMZrsWlTdVe95jPFaa8qKyTouRqr0AVySubibtrVdkiUSP4zI0PzdywAXT2VGkB75QFy2sdfUmYnme4p/62JFUVwAU6IfFcPxzzctqafvp4Ce8XeJucllPnZlUmB2OpQoQP78vGCNPu5oswLZeBCS0lhbw/KnyA5lnJAre6VqahCdGwA68O/nVMbevZwSRy1ItcDe09WKu8+8kPHYvI6n+BeGcp25bujH95QwaUexQXdxqgulSr0uyqal+EVOwG6JSg93wdzmmPi5IDenh0y9ELla4u2kW199tTGBFJuwGh9RxOnznVp+aq5c9aaJSwbySldAkaikqOTj7fbE1VE5n6Z4OTccZjjApcxvXUxl5WvnZZ7Li+SQcnwBUKycS93DbrCYnYE1nkDyXXDut/YWt6gnLpBsSaY4HzYOFFHFImcwwr6zwHggNdFV8qu76a8pOYZ2Ib6lsCt302s/6kUalhO3Iip1mXnIQ/9ZSy9+ia+PXXWMo8rQ/+US4/lTiJJMX9S2CxDztbia/Q60nShgJu1aQLaCV/mjAxNar0VPUfqyQudSrKVMyekIvAlEod1O5NaS5jyRkLtnC771Twfjt6dzIxiQq44mhZE+KkL1kSqk0kqQQ5z1nhgA47P36zuzMiwtq4/OMyaTlIg97c6wn1lMb7K6Wpw76Op9RsQdTIKLDV/1f85zhnguKkPQVRxTr7+ghYPUa1f9+js/9UOAesV9N2+c/xvNMuHwFySGG7kEc30Ejb5GgGT1MHEBuTaltglaj33aviaBubdYzRvf3AyFYjX6hL0ncJgRnaY21aHxOMl0YSBuajLDFHs+Df2YX3T450QPQ==|920 \ No newline at end of file +}//9BhBzEaUeveUen4Tk/Um4DLmbEl5TrDJfSNewFBDnAFExNv+UhCWgVNK7Cs1E+GhDtJhygPyfzG6Zzp1+FE/s3//Hr3gwceNZUdXyPDhFcoo2nohtW4McwYJJt+qBhZ8/etvgA2LRxiDEGn3kWMMZkiJd75cmqUSxSWIbm0FjHOqPcj96ZZ6nPmcd4dOK8UpRPavyZxlGjOApetirBEJ9aA8pfSJfHhhWyB9camnrMvUbbM4jTmHuDwpZeq9zzRhRfuXckpxqI9+dbta+LV9cXJ9RstaWzYC8PkCafTo92Ij2mMWvaQDGC/jvXrAYpXwmUR0s8MPpHs4I9z6BFP+AA6expC6C2zhLW68E8obih2/AEJIu68X1SXmZ3gnmED73G9b+wd5/c1SAHi69YLXrmMU+GVQqcovjbmPg+myBs/KSB0QrwYwte+Anndke1ELnkgEWkc3aEXel1XGu/aW8ZfcwLJRkXpTCMuJX60dsi0UeRKrDufpOv3f9nv7SwsKz/bI0tgVJp6H2z5UcxYCy3yAQS16Z3c4iE0aGRmntgmMQxC98VjsIvMBL4EU3P+Hk8EkKl7+EX3LNmrrD9+BqPnQUXKIVWXNkaSsEzWxs3RI08rJlxSmaClgfi0LwJqefnsWU9wdXl4MsgOs7xS2kh0U2vv0AjkBapELJKV5GF9K8eplr1QO7vhflT385kePcvduYPXlj0mN3e/TjUoUjTRjmlTQDDXUyd6AMzRz0aTqEqEsM5znLiJrGPRWFRVkCqmjU3HTlqI9lpRt3znykLWcxOHyiLmkTtUGqqjCLka2ekgpVJbSjsiWjaeUSxcsAtd8TySEaF00Ha/we81Tn49An664sd5FQkiVGQVz9wrg2cvVxo2lUSXo+SniriqFIs7PEfo81TxE/mPBdN3iBg==|920 \ No newline at end of file diff --git a/Pages/客户/客户部门管理.rd b/Pages/客户/客户部门管理.rd index bc6de35a..4afc3504 100644 --- a/Pages/客户/客户部门管理.rd +++ b/Pages/客户/客户部门管理.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 27, + "ColumnCount": 33, "RowCount": 16 } \ No newline at end of file diff --git a/ServerCommands/客户/删除客户.json b/ServerCommands/客户/删除客户.json new file mode 100644 index 00000000..224f14ae --- /dev/null +++ b/ServerCommands/客户/删除客户.json @@ -0,0 +1,94 @@ +{ + "Name": "删除客户", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "客户ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否有项目", + "TableValue": { + "TableName": "项目表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "所属客户", + "GUID": "637f2358-a21a-4a7a-833f-afc4a88d5316" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户ID" + } + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "e3b4ccaa773042f5b0341122d9975d2a" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "客户表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "客户表", + "ColumnName": "ID", + "GUID": "7d073840-ff5f-4933-877a-75e0b99d6715" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=客户ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "客户表", + "ColumnName": "客户名称", + "GUID": "31b332da-d0ea-4298-939d-aa1ab933d334" + } + } + ] + } + ], + "ID": "3601fbf0-f64c-49a3-b8b6-74b01f792369" + } + ] + } + ] +} \ No newline at end of file diff --git a/Tables/客户/客户分组.json b/Tables/客户/客户分组.json new file mode 100644 index 00000000..009006a7 --- /dev/null +++ b/Tables/客户/客户分组.json @@ -0,0 +1,53 @@ +{ + "Name": "客户分组", + "Columns": [ + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "Unique": true, + "AutoIncrement": true, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "分组", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_Creator" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_CreateDate" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifier" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifyDate" + } + ], + "ExternalDatabaseInfo": { + "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "AllowModifySchema": true, + "ConnectionId": "业务表", + "SourceTableName": "客户分组", + "SourceTableSchema": "dbo" + }, + "PrimaryKey": [ + "ID" + ], + "Indexes": [] +} \ No newline at end of file diff --git a/Tables/客户/客户表.json b/Tables/客户/客户表.json index 4ff9cb0c..63b38ebc 100644 --- a/Tables/客户/客户表.json +++ b/Tables/客户/客户表.json @@ -1,5 +1,168 @@ { "Name": "客户表", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionResource, Forguncy.RbacPermission.Core", + "isExternal": true, + "detailTables": [ + { + "subTableName": "项目平行视图", + "subColumnName": "所属客户", + "relatedColumnName": "ID" + }, + { + "subTableName": "项目表", + "subColumnName": "所属客户", + "relatedColumnName": "ID" + }, + { + "subTableName": "客户部门表", + "subColumnName": "客户ID", + "relatedColumnName": "ID" + } + ] + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", + "operationTypes": 13, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 2, + "roleNames": [ + "Administrator" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowBindingConfig, Forguncy.RbacPermission.Core", + "operationTypes": 13, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.RowFilter, Forguncy.RbacPermission.Core", + "userFieldName": "客户经理", + "filterType": 4, + "condition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "客户表", + "ColumnName": "删除", + "GUID": "335570ae-d886-43c6-af3c-178bfa10ee18" + }, + "Value": "1" + } + } + }, + "dataPermissionType": 2, + "roleNames": [ + "FGC_LoginUser" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordBindingConfig, Forguncy.RbacPermission.Core", + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.CreateRecordFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 1, + "roleNames": [ + "FGC_LoginUser" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core", + "fieldOperations": { + "ID": 1, + "删除": 5, + "地址": 5, + "客户名称": 5, + "客户税号": 5, + "客户经理": 5, + "部门数量": 5, + "项目数量": 5 + }, + "subTableOperations": { + "客户部门表": 5, + "项目平行视图": 5, + "项目表": 5 + }, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 4, + "roleNames": [ + "Administrator" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core", + "fieldOperations": { + "ID": 1, + "删除": 5, + "地址": 5, + "客户名称": 5, + "客户税号": 5, + "客户经理": 5, + "部门数量": 5, + "项目数量": 5 + }, + "subTableOperations": { + "客户部门表": 5, + "项目平行视图": 5, + "项目表": 5 + }, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 4, + "roleNames": [ + "FGC_LoginUser" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.DataPermissionBinding, Forguncy.RbacPermission.Core", + "config": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldBindingConfig, Forguncy.RbacPermission.Core", + "fieldOperations": { + "ID": 1, + "删除": 5, + "地址": 5, + "客户名称": 5, + "客户税号": 5, + "客户经理": 5, + "部门数量": 5, + "项目数量": 5 + }, + "subTableOperations": { + "客户部门表": 5, + "项目平行视图": 5, + "项目表": 5 + }, + "dataFilter": { + "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" + } + }, + "dataPermissionType": 4, + "roleNames": [ + "FGC_Anonymous" + ] + } + ] + }, "Columns": [ { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -14,6 +177,7 @@ { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "Required": true, + "Unique": true, "DatabaseColumnType": "nvarchar", "MaxLength": -1, "Name": "客户名称", @@ -21,6 +185,8 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "Unique": true, "DatabaseColumnType": "nvarchar", "MaxLength": -1, "IsAutoGenreatedIDSettingEnable": true, @@ -42,16 +208,16 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "nvarchar", + "DatabaseColumnType": "bigint", "MaxLength": -1, - "Name": "地址", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "Name": "分组", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", "MaxLength": -1, - "Name": "邮箱", + "Name": "地址", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { @@ -61,6 +227,14 @@ "Name": "客户经理", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DefaultValue": 0, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "删除", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "BindingInfo": { @@ -118,6 +292,14 @@ "PrimaryKey": [ "ID" ], - "Relations": [], + "Relations": [ + { + "PrimaryTable": "客户分组", + "PrimaryColumn": "ID", + "ForeignTable": "客户表", + "ForeignColumn": "分组", + "IsDetailTableRelation": true + } + ], "Indexes": [] } \ No newline at end of file diff --git a/Tables/客户/客户部门表.json b/Tables/客户/客户部门表.json index 7a66076e..6943a3ce 100644 --- a/Tables/客户/客户部门表.json +++ b/Tables/客户/客户部门表.json @@ -20,6 +20,7 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, "DatabaseColumnType": "nvarchar", "MaxLength": -1, "Name": "部门名称", @@ -32,6 +33,13 @@ "Name": "联系人", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "电话", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar",