diff --git a/.collaboration b/.collaboration index acd945e4..bc63c6b5 100644 --- a/.collaboration +++ b/.collaboration @@ -198,16 +198,7 @@ }, { "ModuleName": "Table/客户部门表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-26T16:06:26.4214042+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\客户\\客户部门表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/客户分组", @@ -591,17 +582,7 @@ }, { "ModuleName": "PCPage/项目信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-26T16:05:46.8096807+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目信息.json", - "Pages\\项目\\项目首页\\项目配置\\项目信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位配置", @@ -829,17 +810,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-26T16:07:29.6011873+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目审批历史", @@ -1399,17 +1370,7 @@ }, { "ModuleName": "PCPage/客户部门管理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-26T16:04:24.094804+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\客户\\客户部门管理.json", - "Pages\\客户\\客户部门管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/客户基本信息", @@ -1525,19 +1486,7 @@ }, { "ModuleName": "UserControlPage/会议成员展示", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-26T16:08:17.2809057+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\会议成员展示.json", - "UserControlPages\\会议成员展示.rd", - "Pages\\bb37d006d7fa42868edcb64a2148268.json", - "Pages\\bb37d006d7fa42868edcb64a2148268.rd" - ] + "ModuleType": 31 }, { "ModuleName": "ServerCommands/用户", @@ -2741,52 +2690,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-26T16:16:10.9843704+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin.zip", - "Plugin\\Echarts图表-10_0_102_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_102_0.zip", - "Plugin\\JSON数据源-10_0_102_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0.zip", - "Plugin\\Notiflix_Forguncy.zip", - "Plugin\\OPENAI套件-10_0_5_0.zip", - "Plugin\\PC组件包-ElementPlus(超哥优化版)-10_0_102_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_102_0.zip", - "Plugin\\UI操作工具箱-9_0_103_0.zip", - "Plugin\\Unlayer-9_0_103_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0.zip", - "Plugin\\内容编辑器-9_0_103_0.zip", - "Plugin\\加载动画-10_0_102_0.zip", - "Plugin\\发送HTTP请求命令-10_0_102_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_102_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\应用服务器操作工具集合-8_0_3_0.zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_102_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\标签页和打开标签命令-10_0_102_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_102_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_102_0.zip", - "Plugin\\设置焦点命令-10_0_102_0.zip", - "Plugin\\读取管理控制台日志-10_0_5_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", diff --git a/Pages/客户/客户部门管理.json b/Pages/客户/客户部门管理.json index 023c1a8c..65555a72 100644 --- a/Pages/客户/客户部门管理.json +++ b/Pages/客户/客户部门管理.json @@ -229,6 +229,7 @@ "DefaultSize": 32.0 }, "Values": { + "1,1": "部门/业务名称", "1,29": "操作", "2,29": "删除" }, @@ -248,7 +249,7 @@ "DataCommitType": 2 }, "TopCondition": null, - "ListViewStyleName": "_RS_NewFashionListStyle2", + "ListViewStyleName": "pms表格", "ShowColumnHeaderInDesigner": true, "ShowEditStatusIcon": true, "UseSimpleBar": true, @@ -595,4 +596,4 @@ "PaperSize": {}, "Margin": {} } -}//uUSFZRWZ7HdoACDCbmYDlQAMS6w0TBW3dSkxjqjIQeCNI5R4M/MIDoW/PIDFb9Q3FtniW28CtfPhSgwRCPCNYIn79kveensM5NvdfEVrKKHCFM1OoJGhHBc80H/dZfT8uJ/MVCh5Zmw7NAolGs9u3VtfTSCyOgtwuDIhEb2zlgayt826RpNL6swezY/ala/eLJCHNTNYScwgALWTAZwThT608YabgVqIxCbpnxYryqsuQDfR3VjkgzrcwtNofUWsUYoQbNi5rATw+I7PrnVEAle1qhy7M4IbA2jy9Yg8aaDc8E7m3ByEmnw9dECOTguThTCku5URWLqdjUY9kzrnSRsRPnriTRnk65UQJ67cxDoGz9jXi+Q/kZ5cUegbEaE9t60cMv1vAphpcdxVDxaNQbnpkcT8YPLcFcRgV2h2FrLZeZK+HHfsIZHxFS38GnvBC2OAO++kimNXbbrIF3PdaApSNf6MjMKlob5KQN1O6qLqW1IDR/n32/pwCSqPX7npcjhNnVT4vq8/qr+XDWK0uTDDpL8pwtzDSY6ItxgeT5kOM0YMWp6NGA5/FNqi7nAfQLQCG+1Ykku3uxHNOsYHAeO01ldBQCLdxQ+qOAlCOf9R+vw5QQHPpCq4W+05L5YZP66QGlV0Su6wGqYsYJnRdvTQqZFGlLQlz3LY1TtTxS6v1CgNxEm6xdP/Wvpttn5rlt7E5JEXGctYVr6jce3E8aWZBxIrGwk7wq6tFTauBHpTBHx8fMqdV2sjBwTgzEA7jKiuZhJS0aP8mhc+6zEKE6IppY4lEE5pfoTW92mxzJRLAwU1oo1eIFecolwBlKq8OKbu/NsTFa5zmtOcghJbOklj2pxENJrSzG4MsSfm8JObPduV0q00cqgDSTN0oj5AMWhnnhs9adUaOF8M2pyxpg==|920 \ No newline at end of file +}//sy4UcvGr8YiFeT80XwM5bO+a7KnvGZGZ0FW7lZ1qFbHacrILUR65+EsZIFXVbOW0yut4HVFxTri/T+uQL7SY0hc815SY5gdDNDV4EEoKr/AX2WoVkFAe62/jAmioHEDpyjYnlk9okm0qVcuQSKyltvlmKN6xy9fcNBFZp8eG0zR//a1TW5palYda4SrBwRUz4AvggpNIMDmbrYLz5cUqM34zQ/TIwZqa4+hr9MJ9oLmWwZHop7VwNK7rsT9FGDbrg8jveAUOVRbihFMu2m9+kmROqFmeHpITs6th6AJBxx2ESgyJlAHAOAnTTVWS3rEpYJCkiCP2y3kqEWrW06f8kp2XOlguIJjll0EWglUs3SrLwLbbRxHCdVo6nqAEUV+E4rbmF/qzJrlHl+78QdT3MbPeBTFr+mxKSSQsAI6d5Fu05Axyia2xRGUyKo4fEYl0t4wwoGFtGE+tS9R3N42dPl21do7ONCgzoogdxZW3DqPto9AVY7D0gCoMLtq3CzlvGlfUK9eBpks0y3obRuiSkKNdxRTS4idRKjvZQlH2V1b8n33lNiMR5kzSKeOg4gv9JbBzJNlEQdfdyDPC802Y/cf4L83XKaqs6/NowLCijg0zHziIXLCGCaiX+ExH+Z8wIP0c/PQTIZHh8/l8H95kfvaxbHJQLEkKzknUwuwAiTXEnLKtWj/AF24NOtvEcbQd4S7NcIyZHw3L4eUbz3MHiFZf+ksaUq2oLgGNbvp4NKEkokBXxohTnpE3XWGxqr9FVs9GMXotK8Ij3u+K8W7pKCNyY1NMIE6kBwZsngH0tJz477tFACNH6j3bOM2mSAc1/8O9Wh04kHgaveDbX0DNCRM/pnRfB6YR7HyYobMjvszbuJ5xyw1IStNWFoBx8N6mhDTq2myHe9O4LOVYeTdZJA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index 194739d0..63780c88 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -99,12 +99,23 @@ } }, "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 159.0, + "Mode": 1 + } + }, + "13": { "GridRowColumnDefinition": { "DesignLengthInPixel": 455.0, "Mode": 1 } }, - "12": { + "14": { "GridRowColumnDefinition": { "DesignLengthInPixel": 28.0, "Mode": 2, @@ -116,16 +127,6 @@ } } }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 91.0 - } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, "15": { "GridRowColumnDefinition": { "DesignLengthInPixel": 91.0 @@ -142,19 +143,29 @@ } }, "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 91.0 + } + }, + "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } } }, - "Count": 19, + "Count": 21, "DefaultSize": 10.0 }, "Values": { "1,5": "加载中...", - "1,13": "进行中", - "1,15": "刷新", - "1,17": "菜单" + "1,15": "进行中", + "1,17": "刷新", + "1,19": "菜单" }, "AttachInfos": { "1,1": { @@ -258,7 +269,7 @@ "BreakpointIdentity": "93ac0fbb-69f7-4710-8707-64e964e081dc" } ], - "ID": "a15ea9b1-0585-471d-94d9-8da4fbc45084" + "ID": "0320783f-7c20-4b79-9e8e-6cebcc65c954" } ], "BreakpointIdentity": "b0a3b176-ed6d-44a3-a416-9360c0ff8e94" @@ -334,22 +345,7 @@ ], "ColorList": [ { - "color": "Accent 1" - }, - { - "color": "Accent 2" - }, - { - "color": "Accent 3" - }, - { - "color": "Accent 4" - }, - { - "color": "Accent 5" - }, - { - "color": "Accent 6" + "color": "Accent 2 0" } ], "separator": ",", @@ -363,7 +359,57 @@ "ReadOnly": true } }, - "1,13": { + "1,12": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "所属客户部门", + "GUID": "ad48dcac-5429-4ad6-a51f-61b615deee3b", + "RelationBinding": { + "RelatedTable": "客户部门表", + "RelatedColumn": "ID", + "DisplayColumn": "部门描述" + } + }, + "CellType": { + "$type": "ElementUI.Tag, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "ColorList": [ + { + "color": "Accent 1 0" + } + ], + "separator": ",", + "size": "small", + "effect": "light", + "allowAdd": false, + "addButtonSettings": { + "width": 100, + "text": "添加标签" + }, + "ReadOnly": true + } + }, + "1,15": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目状态", @@ -404,7 +450,7 @@ "b24876da-8ff2-4736-8ffe-09e4d86a7a9d" ] }, - "1,15": { + "1,17": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -430,7 +476,7 @@ "IconSize": 14.0 } }, - "1,17": { + "1,19": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -438,7 +484,7 @@ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "PopupDisplayMode": 1, "Placement": { - "SerializeProperty": "=项目标题!R2" + "SerializeProperty": "=项目标题!T2" }, "ClosePopupCallbackCommand": { "Commands": [ @@ -486,7 +532,7 @@ "BreakpointIdentity": "7e0822bf-35cd-4983-9935-b4f09f551a2b" } ], - "ID": "462fa6e7-772b-437b-b5ac-21a7790b922b" + "ID": "b6222a0e-7287-4870-97dc-bad9c9102d4c" }, { "Condition": { @@ -509,7 +555,7 @@ "BreakpointIdentity": "09c0e29b-5a2c-4206-a4f5-919eec7cb09e" } ], - "ID": "efd8a7fb-4c41-4b63-ad90-6c63c1384f2f" + "ID": "8f0d0b0f-e334-44aa-98fd-e7206bc4be2f" }, { "Condition": { @@ -559,7 +605,7 @@ "BreakpointIdentity": "b01dae39-d21c-45d1-a85e-f4a255964a77" } ], - "ID": "a9def0dc-126a-4564-9447-d5576831cc86" + "ID": "9de89fb5-33c8-4800-8fea-570b40eed065" }, { "CommandList": [ @@ -570,13 +616,13 @@ "BreakpointIdentity": "ba2732d6-0520-4256-ad76-1d97e4c5320a" } ], - "ID": "dc297276-4dba-4a3e-a886-e97dd74a3d43" + "ID": "b0c6bf9b-3160-4e7b-953a-8d9584f62e91" } ], "BreakpointIdentity": "8feab600-304e-43f2-b5f0-3932e63e5285" } ], - "ID": "bbbb3d6b-6d97-4403-92db-60424577e71c" + "ID": "eab1f71d-8467-4f9a-bde3-120c8afcea11" }, { "Condition": { @@ -644,13 +690,13 @@ "BreakpointIdentity": "edb5f15a-41f3-448a-bd18-10fec354b0c9" } ], - "ID": "6645630b-a16d-409f-81d6-a4ded0ccdaea" + "ID": "83b275b2-973a-44ee-8d54-d8d57a827f6a" } ], "BreakpointIdentity": "30bbdf92-551f-47ad-806f-9f7f4794a52b" } ], - "ID": "2d3d50bb-03bc-4452-ae3b-68c03dd816bb" + "ID": "4400342c-76ea-4d86-8b9d-bdc504c4d646" }, { "Condition": { @@ -752,13 +798,13 @@ "BreakpointIdentity": "3d653eb8-a9fc-4a44-bd99-6f6c67f75d1c" } ], - "ID": "aaac4972-5bc8-41c8-86bd-2fd883748138" + "ID": "0e511df1-6699-4b24-8d8b-b4da37718bc0" } ], "BreakpointIdentity": "d8ae111b-2b83-43da-8ba0-1ea6b03bc8e2" } ], - "ID": "0daf2931-1a73-48f9-b86a-2a219b912fe8" + "ID": "17aa0b59-4679-49a2-a838-8f354e3d1865" }, { "CommandList": [ @@ -769,13 +815,13 @@ "BreakpointIdentity": "756ed293-76b8-496d-aa1a-5e1bf3fc076d" } ], - "ID": "1e01819f-268c-48bc-8c86-cb975cd4045c" + "ID": "5bbe4264-978d-41c6-bc33-64d4eccb5665" } ], "BreakpointIdentity": "95af4ff9-cddf-4f43-8d75-6b2c931bc6fd" } ], - "ID": "97537957-de6c-42ac-aa92-d80ff8e1b69f" + "ID": "2182a6d1-fd92-44fb-935a-381c6b1f1aa5" }, { "Condition": { @@ -809,7 +855,7 @@ "BreakpointIdentity": "910a7066-07af-4af4-a44c-3799fd68ebd1" } ], - "ID": "976772fa-e68f-46e5-8b57-4b9e898274f1" + "ID": "b02d43fb-5892-42f0-9e6b-09cffe03ae72" }, { "Condition": { @@ -832,7 +878,7 @@ "BreakpointIdentity": "c5dc9a3a-dcb5-4534-85ad-8ae1954da410" } ], - "ID": "5128008b-6401-4010-a9a9-24785cec2789" + "ID": "beb911b8-4207-4b58-9500-98f8860d0af5" }, { "Condition": { @@ -868,7 +914,7 @@ "BreakpointIdentity": "466ce9bd-3dc9-4afe-afa7-2df4fe5f7e23" } ], - "ID": "186fa5cf-41e0-4e1e-a91a-4ba179ff073a" + "ID": "9ef52a5b-c804-4c0d-b69b-fe3a3231ac9e" }, { "Condition": { @@ -999,13 +1045,13 @@ "BreakpointIdentity": "60997118-26bf-44ce-bc0f-b1531de0e9b9" } ], - "ID": "e015c93f-d05a-4d3e-a985-41b5b3b9d5f7" + "ID": "ade158b8-06f7-4f1a-9ff9-13692ab90121" } ], "BreakpointIdentity": "dce59186-3abb-4231-b4e8-842ec301da20" } ], - "ID": "53d6400d-ed3d-4ddf-816d-dd143a88cd58" + "ID": "fe80bc32-b2b9-4e23-a075-b2d0c53df1c5" }, { "CommandList": [ @@ -1019,13 +1065,13 @@ "BreakpointIdentity": "0edb8222-5ce0-4e3b-92cb-b32a92078fe7" } ], - "ID": "7641c5fa-4f6f-41d5-8063-a2bf65a93344" + "ID": "7ae1a566-af11-41ea-9a56-6a75e433b773" } ], "BreakpointIdentity": "8b1853ee-7a60-442a-b1eb-b5017d21a08d" } ], - "ID": "5018909e-6f5d-4257-92c7-c538252dbae6" + "ID": "afd3b5b5-083c-49af-aaa1-56ca4268bedc" }, { "CommandList": [ @@ -1036,13 +1082,13 @@ "BreakpointIdentity": "1852f4a1-cb35-4e85-95a3-9e1615ed8beb" } ], - "ID": "347c143d-d4ba-4399-9682-c2a291739a69" + "ID": "40d2d797-41c0-464b-8796-eab24a3d2362" } ], "BreakpointIdentity": "4e529179-17b8-49f1-a0a4-13304e269271" } ], - "ID": "aaa06f85-81e2-48be-a21a-a2db1c57f8f9" + "ID": "1f7c1fee-60d2-4196-868a-1bb8d120ff51" }, { "Condition": { @@ -1087,7 +1133,7 @@ "BreakpointIdentity": "5a7bca19-6bac-4c68-b0da-be6c272ee4a7" } ], - "ID": "91046972-48ac-42c3-a275-65432a9eb105" + "ID": "8388bf8f-4ef6-433c-bae0-de678834b4e2" }, { "Condition": { @@ -1151,19 +1197,19 @@ "BreakpointIdentity": "fd794d0f-90b7-4ef9-b93f-b324f5803950" } ], - "ID": "c840edcb-732f-41ec-8276-853cd5e44b59" + "ID": "39e60f14-af9f-4e5e-a92d-0a12e0dc4748" } ], "BreakpointIdentity": "3884c00b-6b8d-4091-b4fa-b3c78f3973dc" } ], - "ID": "9b54fa7f-f23a-4687-a4b3-1754e8e0358b" + "ID": "f12e0329-3456-4b88-a1e8-17e6ca0d5a00" } ], "BreakpointIdentity": "071cb003-e718-43e6-9140-e2043af3c7eb" } ], - "ID": "543c7d9e-6acd-4c87-8d12-9ccb601dd273" + "ID": "87485304-9a4c-4cd2-9015-9bd57180d762" } ], "BreakpointIdentity": "132d40ba-1042-4a52-a632-f30e854ca2ef" @@ -1242,7 +1288,7 @@ "BreakpointIdentity": "1b7ef161-545b-4885-9fe4-53e7edad5e25" } ], - "ID": "91875edc-ceb3-41ba-8f5a-48b7b0e2b8cd" + "ID": "da26535f-8dae-4537-9ba2-5fb3c8b77309" } ], "BreakpointIdentity": "aa963409-8fa1-4eb6-b070-48ff6d05409f" @@ -1326,6 +1372,11 @@ "FontSize": 13.333333333333332, "HorizontalAlignment": 2 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 2 + }, { "FontFamily": 0, "FontSize": 13.333333333333332, @@ -1344,9 +1395,9 @@ ] }, "CellStyles": { - "0,13": 0, "0,15": 0, - "0,16": 0, + "0,17": 0, + "0,18": 0, "1,1": 1, "1,2": 1, "1,5": 2, @@ -1354,31 +1405,33 @@ "1,9": 3, "1,10": 4, "1,11": 4, - "1,13": 5, - "1,14": 0, - "1,15": 5, - "1,16": 5, - "1,17": 5, + "1,12": 5, + "1,13": 4, + "1,15": 6, + "1,16": 0, + "1,17": 6, + "1,18": 6, + "1,19": 6, "2,2": 1, - "2,5": 6, - "2,11": 6, - "2,12": 6, + "2,5": 7, + "2,13": 7, + "2,14": 7, "3,2": 1, - "3,5": 6, - "3,7": 6, - "3,10": 6, - "3,11": 6, - "3,12": 6, - "4,13": 0, + "3,5": 7, + "3,7": 7, + "3,10": 7, + "3,13": 7, + "3,14": 7, "4,15": 0, - "4,16": 0 + "4,17": 0, + "4,18": 0 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "2,5,2,7", + "2,5,2,9", "1,1,3,1", "1,3,3,1" ], @@ -1472,7 +1525,7 @@ "CustomNames": [ { "Name": "项目菜单", - "Formula": "项目标题!$R$2" + "Formula": "项目标题!$T$2" }, { "Name": "项目首页导航栏", @@ -1483,4 +1536,4 @@ "Formula": "项目标题!$F$2" } ] -}//0/EkXO7GgfLRbIQN82UeufJLsLIHXMBmO3oMQetO/WPwCB7plx/pxMGK9+t0K1T3qE5UT8ee99bcrg8uWYMEO0uJkZohfNljKpP+aOWRlbyogzO3qdjILVxSGCaxJ0DA8g4Sc0XgKr2r9nm8BzMoIs75H/UXHFk/F58UMfBOq+6Qt3wU5Rxgp0PLON7CS148OPrVSa3EmYBSScuY4kpeF6tABcz41uZtW3CKIjK3iQsSypFfzLHvVIqQAeRUPG4/iZNRFGod8FFxZO0CaSbpOi7Rp/HkrSroy8gasEgAGy5lTARzSHSnU+TdoGTOwBMY1JTCBjIIlcUNnmSKAe4sKV4p/9Uaz1szjisrgXkJ1GHxwsrzbhz/HKMYrdPNE0GH9RrP2wMeSDVlBR78lHA6Gc+qT6HKsVkqvwsbrsZpRCro7YZ6Udy1Zhwy/YwaNFMcAuhAkG4fjb4Pd7VJRV9SG6kPk32sJXsPU4xSnkrA+PbalvvJXq7FKm7yzUq7EJGfcal7bk0F1oXIGi33/nkd78lc/89I0kEqDim18aVoPN6fR3CWwNhjWhGz2nclqnCDSjAKVI2Pv3qaixAc12KirOokZvkRjjbLr94+hWRlZxUsvAb1MLM2f/6YpqD8ur5yiF83Cuc5yBkKxNCK0hCQT3pf/ZTjuquibMNG17VghnayLaq/9GbUM53Afq/iaspOiksF7ojB/trOtZDE02gHS1L2fotClMABEirrSPrKKCCueX57c8Wg1nZ/yu+Wxpvihms6YUs4TVAhYIVz0KUN/VTfBh1zmalvwkiPGvTKC4h7Fg2Oh9Mpz5i5cLQBv8ebUqjUIEbCe8puk57vRen2D+z/fH/BCgPVkQLQpGkyBhHwwYCnWs9HHkgcnwXQCBqoBgSXDFphTkwKWKw9upJErA==|920 \ No newline at end of file +}//aytJj9GEf0jR9w43w/OaP28XF0SxHCtu1EQ8saeMzc7t/U+kpkyg0nlzkpCRu5ImMO9P3TD6UN+irhexqKusLq76E80z7faIOZH6fJCcuUQg/smsTw/xFgducce6uPiEPuHJt4ewD4e2WRTRjZDCuFBlqwz7jTzHRBZe78qM4hABhWaonSRBW3OQaXvRz5XE3zTmJCUURHmHhcxWEX2cNwE+v5jmJvsuJLLy1i2oh8CU84Febg4oy6VoD+ImEyTazKEBZQM/GhyrwxxhqvAfISh6lH8bR7aDL4QyL7V86Jd+7Me0pxjR3ZHQqHw19XFEXxMlWa77Ray0mm83epB46pBzEfCNqBXr/QltPKqjCVZsdwO+ML5TGltpaGLGiTXNctoED+EtRLCfjrr9Uplwd8Q+1bkotqreTaA9yu71IJTi9fD9b7PVztGlSSJEZAwjuvExKbqdEbi0L1v8FG0YCHyGyeJF3353J3Ebjoc68zFgMih7UwRirkRk5w4/JJ6xYJpfauO17rMuHFCo8m3+QLe7OjNsRKlAK50kZdl6WOlKTIfhEtjbATx452rW1UKYQAsgr8nP/4bOzJBDtasoa37Yf3XNdlEiJVkIsehCQYWhxLX4QTId77f/JRG/6dPN+UNyTrtCxBrc6qLYEVOCIC677zOWvM1O024bi0oPyOGnihbSIpaM8iAHwMLvvSbv6xiwaEyT4IAjCWfssGnGQLBei48omKvqpxCYN0zo+Yg++B1c/qGTq2LL9JK1Irp9hwHbKHibdzx1XKzI7ijBjC/7cPPvVEW1b32rZ/rpwKisnuY6ezxU7FW7bh3xMCjnp6aCp/veP1BMZYld0QB2woS39h+pHvHpESM5hvbPV+4V7e8o+vP309BLjpl96J8+INxmMxa06zCs6//d+nwYBQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.rd b/Pages/项目/项目首页/项目标题.rd index 36391036..30954ebf 100644 --- a/Pages/项目/项目首页/项目标题.rd +++ b/Pages/项目/项目首页/项目标题.rd @@ -1,11 +1,11 @@ { "PageType": 0, - "ColumnCount": 19, + "ColumnCount": 21, "RowCount": 6, "CustomNames": [ { "Name": "项目菜单", - "Formula": "项目标题!$R$2" + "Formula": "项目标题!$T$2" }, { "Name": "项目首页导航栏", diff --git a/Pages/项目/项目首页/项目配置/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json index 242e6811..17ab3741 100644 --- a/Pages/项目/项目首页/项目配置/项目信息.json +++ b/Pages/项目/项目首页/项目配置/项目信息.json @@ -294,7 +294,7 @@ "11,15": "计划周期", "14,1": "所属客户", "14,12": "添加", - "14,15": "所属客户部门", + "14,15": "客户部门/业务团队", "17,1": "项目经理", "17,8": "商务经理", "17,15": "客服经理", @@ -367,7 +367,7 @@ "BreakpointIdentity": "ab2a6abe-7630-46de-8ffa-6b850a235fb5" } ], - "ID": "42211a44-df3f-4c1c-9f32-b304f9cbe5b6" + "ID": "21a0e07c-a9fe-437f-adf7-63213fec23f1" }, { "CommandList": [ @@ -611,7 +611,7 @@ "BreakpointIdentity": "398d70b4-d373-42e8-b4be-52ffde228d5c" } ], - "ID": "719547e8-8719-4260-96e0-50e6b45be89b" + "ID": "d2b067f6-ab8a-46d6-973b-20d9be0478b2" }, { "CommandList": [ @@ -627,13 +627,13 @@ "BreakpointIdentity": "22418f56-f017-4cf2-b914-e01df5a61cde" } ], - "ID": "78dd8f2d-913a-42ea-869d-6f2cb5d116cd" + "ID": "c0f3896e-83e5-4c69-b212-68bc90a084ed" } ], "BreakpointIdentity": "327f1c9f-927a-456b-a479-98c6ef40b20f" } ], - "ID": "82e84211-f421-4a52-a43f-9d999de91c51" + "ID": "23c46a55-f480-4621-af27-09b6465b7c0e" } ], "BreakpointIdentity": "a5397ab9-6dd4-49d3-b93a-eafcca423521" @@ -858,7 +858,7 @@ "BreakpointIdentity": "bcf152dd-f0c5-4cf4-8cbe-aa0a9590ebe6" } ], - "ID": "80ba22c6-fc8d-4e88-a8b1-0f536856e481" + "ID": "3d1bb6ee-693b-4e85-bc23-4f2ea1eec2f2" }, { "CommandList": [ @@ -869,7 +869,7 @@ "BreakpointIdentity": "6149191a-1e90-40b1-9cbb-2936d98dd746" } ], - "ID": "19d95923-bcf2-481f-8f68-495a1c74280b" + "ID": "8c662e2d-dd82-449f-8c65-ab35453282c8" } ], "BreakpointIdentity": "b1ec056a-5190-4a6e-812b-69a1c6a0c512" @@ -1038,7 +1038,7 @@ "BreakpointIdentity": "415513d5-9c42-419c-9fd3-1b92c5181008" } ], - "ID": "87105f53-9dcc-4c49-af73-e2c2f2a776dc" + "ID": "516f3fbb-e6e1-47da-8059-2056d42966ed" } ], "BreakpointIdentity": "9856b4e2-124f-4ed3-96ee-a95c3e472160" @@ -1250,7 +1250,7 @@ "BreakpointIdentity": "4d58f6fc-520e-4b35-a966-e1b144ac2dc8" } ], - "ID": "7794ac4c-9a76-4526-85fc-773fcb0b1337" + "ID": "6bb4daa1-5186-40b5-b45b-0d23c2d0f386" } ], "BreakpointIdentity": "f6096ee2-1954-4ac8-8287-fe55bde74b1b" @@ -1298,22 +1298,24 @@ "TableName": "客户部门表", "BindingInfos": [ { - "GUID": "679db10b-5bd5-4493-b45e-27135e95a6a8", + "GUID": "63c9fd4c-9ad2-4fbd-a764-2f01d1d81759", "BindingInfo": { "TableName": "客户部门表", "ColumnName": "ID", "GUID": "5089e384-ae95-41e9-803a-ef14b20412d5" }, - "ColumnName": "value" + "ColumnName": "value", + "Alias": "值" }, { - "GUID": "02196ecd-6617-4407-a4b4-7d2c08f44a01", + "GUID": "32977d4d-eed8-4676-8cd6-9810736415cf", "BindingInfo": { "TableName": "客户部门表", - "ColumnName": "部门名称", - "GUID": "5279c4b0-9837-451e-80c9-7ddcc0a27746" + "ColumnName": "部门描述", + "GUID": "1f523185-4c5d-40ee-87cc-8183eeb00d08" }, - "ColumnName": "label" + "ColumnName": "label", + "Alias": "显示文本" } ], "SqlCondition": { @@ -2014,7 +2016,7 @@ "BreakpointIdentity": "b5a7e5b8-b54c-421f-91f5-b840f4ca63e0" } ], - "ID": "84896a7e-a7f5-479a-b8da-ab1edf711fdc" + "ID": "f5ddbe02-acd1-4db2-abc4-237a0afbd818" }, { "CommandList": [ @@ -2025,7 +2027,7 @@ "BreakpointIdentity": "00326fd9-70d8-4c14-84ad-4b825f51c6f1" } ], - "ID": "7a58590e-55b5-436f-b3e7-997018c1ecba" + "ID": "45cf1a1a-99ed-4a40-b049-28f326f3920a" } ], "BreakpointIdentity": "a32dbdfe-ce56-4ab6-9981-b0d8569318db" @@ -2133,7 +2135,7 @@ "BreakpointIdentity": "592102bf-5a56-4119-9dab-6c4bd1a1022e" } ], - "ID": "34f5230b-d618-4c88-99d7-640c2c2f837e" + "ID": "334002e5-32c1-43ea-8cdb-2270e700e5be" }, { "CommandList": [ @@ -2144,7 +2146,7 @@ "BreakpointIdentity": "592102bf-5a56-4119-9dab-6c4bd1a1022e" } ], - "ID": "928e9733-f75f-435d-8391-bd629de68845" + "ID": "b6862dde-0cf1-4c0f-93c2-e3aca369a650" } ], "BreakpointIdentity": "b0a2b2fb-a272-4c56-829c-3d41bcc45978" @@ -2258,7 +2260,7 @@ "BreakpointIdentity": "a767124d-b9dc-45ca-91f5-f75f0f638768" } ], - "ID": "99162a63-c43f-4ae7-9df4-21fff3cebca2" + "ID": "b6e6640f-340d-49a2-af79-9da6349a9218" } ], "BreakpointIdentity": "032f8811-40db-453d-af53-e496d0c1a358" @@ -3082,4 +3084,4 @@ "Formula": "项目信息!$B$19" } ] -}//i6EVEHBN/jmbkmMZnrafd+T2/APbIyA6CygbposOb1rmOoIjzJcIpr0VlCEmksfv1ZBWs7an6VG/QRlWKB7Vz/yI6vTjWPJ07Zzqosh/0A8h21F5IMvfTQlE4Zjliy3NtbdNf14WmsJccSzZ+kHFck2WBq6o7a0PlX2/uO6dr6XEy0lX4W5Q9AVjrIGI1gmgYgK3T6nKqdvINj93Rtbnw6XnFNxJnDfBGiTnvOKN1N7qzrVseEIrwtEBa2R0P6B4NgEMqDkkI/RrBxLCkprKLrQ1d6FZDo/xo/AGHjW6fjgq3tYkoyOVIplAVbkoeQqJ6GICdMuvUpioWgKhOk7245CLadCgB9xxbiSUuEklkfzHWA3oONV0sa60blGUHM9EaiyCleLmvUDlHsVBEJagTvPZSs4WnmTRqutNygf/NY+/wMhFH/f31juulkZBvsHqPeFWmUmiFUOOJp6X6BBPp7MJoaMSFVAQTCO9A3Hn6pJ00vLtpa3PEAgI6eRUVELzV/4p22k/XgryJL4wFrL7tCfRoHaBf6aMN3KbTI9HKfkpz62w15Iw7dYjJeH5bZhgjBqkcU76p8CM1/db73/9mY3fxHqvDzkoAGVYGJ3M65gOM3FYBjLDh5irCRmmmF7L0swyY+0oXgd1xiAIzHydxSR5jC0DjYVPvA8P8dCDz1Qk8seWQQQCxDJ2Q99xLKEkGlRIlWc741vG0Jcv5dmLxbqgIIj+xbtE3rDvqtDlyEcmDq8kazYsLydSeA6oM3EYJ6/SjQkNgZ91t0hwmImDhj/yJTUEUmylAJYnwonu76Av8xXqyEaxVF2705hOOxNiVZECzh4AV7NBzAaqsGfxtZksfXtIQn/y68u5ZavlRSTvbxXj8kNbSlKR07lrr2eGb4TTAjXFWadQn874XDNwvQ==|920 \ No newline at end of file +}//H5FuCIpmTVhxHBT413hLVOSD+cb9vcVvpbm++TuYyW9PtPFrDKU1D29bRD0fUrDvvrfwipg0P7d7lGaz+n/kuny97ERfjC+AjcUHy16zFcvlYBwlaH6BEaM9en1fbSAtcTX+cZh343zK72HGmow0Ij1qHmZb+cbbk5MEYw9qIdVJtchgscj773M55OKpN9R7B7cblkYNG9ZXrWB9HHK6uEqu1jv70u+Epr5xxBh4ZZagO4r5ileJSER/IHU0ozcBrK5/2mKm4+J0Tl9x974z699pGXPUdfXzn+3hWYqERpnIt8semQgdOY02jQrBEmVSF1t9KQAERwlVYJSwmwIdaV5tQElg5oKrNPxXptM80KyAmhIRba6jf7nHT1dg0HPqQP7nYAmVUhmWkrBhfUNvhB169PwKMBU7751zQsdqrqJwfOlIsyG/YoEK+c8+VXfNOjEOQDXjrxwnGIq8HOolMf6OyORBGjnZ2wFqk9qeSnn2TlPQj17amCmAcjFWpHc28QAR9WFggDN/KgaKVtTW6bkiZ5UzfMR1NN29yQyrunNHmr0J2j23vm45teAHqfEzJRC1desoJjE16Fui0cJNXx/et3GzK+dHmOAsgZDFs/OzCGtlMb9jVTw7MnlslssMcKbURmuw4A8Wkh0kFmE8Zsn5Z9p0Op13tVg7hKPKQDqBYb5Z3fnp5BOQ5OFpW7i1rckOJ1i9Nlm3mY69IN6ay52VOA8UdIEYFF0xysBH552k2075XUV37GmK+qfPnoGzzKw8v9yxpIh1SJlIZqGe0SPE3051dQIgfzeTxrOqJ98dv66sqWtxOH7vkt4RU+8p7TGf+cWZIMxi8L9NDqa976XuOylkAwI8ZMN497kYpeeLnI5HSy196ddc/yrG5P2QquKCQuok9N4euN5+Xiv1Lg==|920 \ No newline at end of file diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin.zip index 1796c9ad..065a605e 100644 Binary files a/Plugin/DingTalkPlugin.zip and b/Plugin/DingTalkPlugin.zip differ diff --git a/Plugin/Echarts图表-10_0_102_0.zip b/Plugin/Echarts图表-10_0_102_0(1).zip similarity index 99% rename from Plugin/Echarts图表-10_0_102_0.zip rename to Plugin/Echarts图表-10_0_102_0(1).zip index 42aafe76..d8110c95 100644 Binary files a/Plugin/Echarts图表-10_0_102_0.zip and b/Plugin/Echarts图表-10_0_102_0(1).zip differ diff --git a/Tables/客户/客户部门表.json b/Tables/客户/客户部门表.json index 6943a3ce..6f75ed5b 100644 --- a/Tables/客户/客户部门表.json +++ b/Tables/客户/客户部门表.json @@ -54,6 +54,12 @@ "Name": "对接人", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "[联系人]&\"/\"&[部门名称]", + "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", diff --git a/UserControlPages/会议成员展示.json b/UserControlPages/会议成员展示.json index 6d2b5e1f..3d6506b8 100644 --- a/UserControlPages/会议成员展示.json +++ b/UserControlPages/会议成员展示.json @@ -110,7 +110,7 @@ "TableName": "用户信息视图", "BindingInfos": [ { - "GUID": "17606bce-4077-4a2e-a809-3586ecaa4519", + "GUID": "4e537c95-e5ae-4c59-bbaa-fa5360e468d5", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", @@ -134,7 +134,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "e21af03eae4c4a60a2ee3b478afd3d1f", + "ID": "fff9198905dd484d9a584d84e553e6a6", "BreakpointIdentity": "b451730d-d4e0-4dba-8055-45c25f8e5323" }, { @@ -142,7 +142,7 @@ "Listview": "图文列表表格1", "ListviewColumnInfos": [ { - "ListViewColumnCell": "用户名", + "ListViewColumnCell": "成员", "PropertyName": "用户名" } ], @@ -154,7 +154,7 @@ "BreakpointIdentity": "cac71a22-a047-4f59-a509-b2d2e2d4c802" } ], - "ID": "d32ef4a2-4f28-404c-9e2d-05a28640aef8" + "ID": "d4ac2e6b-b53d-4793-af21-afe9c454ea6b" }, { "CommandList": [ @@ -166,7 +166,7 @@ "BreakpointIdentity": "48df8496-c729-4231-8908-167a2c141900" } ], - "ID": "53fa8348-7bd7-44be-8a44-a85b8e6a2c62" + "ID": "2925dd1c-46f1-4d81-8891-f77d2fa25052" } ], "Disabled": true, @@ -230,4 +230,4 @@ "PaperSize": {}, "Margin": {} } -}//hFPWqEs/QeoszHRLpablFqfOTGMURFSHrmJ6VulGJjSuPyHjwXS6sGr02lIurQnZsNQLt4xUz0/S7/Oz0Ry6ivlRqhFRRY7GU4O53i0P3ABUMy3Hd5iZF4VP2SYV87ERTjmFVQUGYA6BUb4TZB0+o9CzSNw8hz++1G3O6SQuLiplnMoQmtHDy3akDwAcP2Ah612kMEcjXdRSsFuoKaRC2aVZL+Smijo1k8Mkf+Pc5q4VfWnoEr7NL9tBBlscDVWXHee0X6J/WunKSUvAtX+RzVaPJ1fe7zfcpi6U7PiqfQNBcJaB5pH/KfvXfHfNG6WxBlUSne0BGEC1s7RdPP4b6Y5hGnUM7h3Ln/Fo/4Aa4fSH7uU13d+N2b7pdM8MpoGXzai8GyRYfqu5xa92TDBuRxF+O/YZXTrkXFtFH0fcvt5FLBaF0nkOYFPB1cfeprPRGdQoQyZD+PT6xWbC3bfERlt1CQpAj63M7RNDOMJZZBPKD+Hhvoa8cGFASFTx+Avpmgg56C5szmdVbcdnHuy2w2olzyFFkpYEvYbB/MxxtpLVMfkj+iXBzp9WqEJketrORRbYVn1f+1ztE8UIO6eesMie9AkhdPAaB4F17bQyGmakKnpkC10btXCqX15Vr8333qeHtXvFjjRIaz/EkDZvKvF36A9h3AMQ/nx+TE02yvkPlAXxLOGuE0zVWVv+Qt2PaII2csXIoJ4ue5eVsujd6GshvB40UZSz/HQhi/JlhGk/40iDu2IfI5CJGIG1Ac/TqGQnZinP9EFGcMyXMTk2AjRLSkvxQ1F1wUVo5wxBnZhEaQ6JKY5ry/y5IvkcwgRUzOGRfZuSCkP99jrQNVP45Aq/DqFo2y5o9GW8xJzyFWGtw1KmsOW7aU34Tcea19T6QnKQ65ci5iUt/h+nswMh3Q==|920 \ No newline at end of file +}///K7HGhQpc0rNIaFOn6jOH4zcvMuUSruWl8lUzdY5ObVTNmNjR8SUTPA85tszThg4uzgn30mKxkpMdz6kvyGr8lYzimHu6CDJCx3A2Ef1Vdvt8MQRhGy/gDJjDNXjOUBh5Jzh3BqrnboFMed1kYpVMYF5rKWhKUwqthT0qkZ+tNo21ndzr0roDLeIh3i9u1bmHw4lzKsxjybAX9PSL+1SwJfbwoa6ganv4Cy7JWX872cBQMa4XzuwNOd5TWdCA7nIVdliOC8JzUknPBZA6AUgACAK7rYVotuDSj73zEngaQkwjoqBZub/6JmZakzx+qKhbacDr4X8f0zF1Ow+3uuhBtoc7d3FPoCoNn/0ibxt3W5uTqIKsLP6mqvR7bdnjuPmrUSj1XXCP3VeqMLxiKN4MTbphmrb28u677O5OqThEWxeAGaXZk4/hqJ4ZITBdUXuzHv9GLba84UsYrcRsucnkkb693uEQhUv/KaqFl7mMRMItMkzeJM6603iU1rzpGrKPRH7WY43yPLMxi+SsOMB9od2d2xy0kDIKRU4eQGBF+At6ugFHFNm7+GH7p3aAWgDhY7QiF92VynivXNRSpbUL9mZbulnby+ftkHnauhXmowHtWJ3yLTlBYpQKUTViGAKRtHcs5alHzIGhOG8Qnues54Aal4tqx5uMPb7YtF92N6J97yAM+q+55RcZXlnxQd3vMx73Ih2kmoGnit9VymxskgwnrC6BzRCDSYqKTMvA9SXmHjMv0f3WEXgSnjcTdzUdy5+nhAC8Ds8+YOLKe6LytAwmjj3M0wTIp5JCghVT7aB7LHCnKn3Xh5NXTpmF9qG8Odx0HTFyijPvFjaa5QKoh1PHZMJVtgn/xI8c/I3joGLsOXEy7Z9eUyXEVwxS+BdWbFL5R5kK78mjV245sqrMw==|920 \ No newline at end of file