diff --git a/.collaboration b/.collaboration index 537df759..57465e89 100644 --- a/.collaboration +++ b/.collaboration @@ -798,17 +798,7 @@ }, { "ModuleName": "PCPage/项目成员详情", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-05-07T10:54:38.0427306+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员\\项目成员详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员\\项目成员详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目代码", diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员详情.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员详情.json index 2276bf60..6b2498ff 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员详情.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员详情.json @@ -270,7 +270,7 @@ "BindingInfo": { "TableName": "项目成员表", "ColumnName": "岗位ID", - "GUID": "fdbf4197-fa81-407e-8471-5bb15a95a4c8" + "GUID": "f05262ab-d0c2-4ac6-9c97-302f305c84a2" }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", @@ -290,15 +290,6 @@ "value": "userInput" }, "CommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!B6" - }, - "Title": "获取中", - "BreakpointIdentity": "283ea5c1-ed07-42d2-90ab-bb9ce01d7175" - }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "岗位", @@ -307,7 +298,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "ff21493d-e204-4d06-a1df-b0c78e97bfd9", + "GUID": "b980c872-86d0-42f9-b651-530c3a53ff2e", "BindingInfo": { "TableName": "项目岗位", "ColumnName": "默认时薪", @@ -331,19 +322,9 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "cbe333b934a3409d8e43a34d9d1594c6", + "ID": "a6b43cd4cf5941dbabf1f3b2531c5824", "BreakpointIdentity": "17dc1bc4-49f9-4a2a-af4a-706434f895e7" }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!B6" - }, - "Title": "获取中", - "BreakpointIdentity": "f60584ee-56d5-44bb-8c92-b5267a684b3c" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -364,6 +345,19 @@ "value": "%Null%", "compareType": 1 }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=岗位.默认时薪" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { @@ -412,19 +406,19 @@ "BreakpointIdentity": "cf5ae073-0461-42a2-b515-4762a396baab" } ], - "ID": "f1641759-fac4-4d00-81d9-a740dde88668" + "ID": "a8b1bdd0-88f4-4077-87e4-a474c006b13f" } ], "BreakpointIdentity": "6a63170b-5c2e-4e7e-ba1b-667a723b4ff4" } ], - "ID": "d6a7052e-553e-45c9-b88c-56552d8231cc" + "ID": "2906bbd6-8a45-483d-9e95-d282570e9e21" } ], "BreakpointIdentity": "cf9568d5-255d-4222-996c-059a1273b79f" } ], - "ID": "dde4720a-67da-4e21-90c1-5667e21f2a42" + "ID": "701d27e9-604a-42bd-93ae-37c76cd6fe36" } ], "BreakpointIdentity": "b26f3b5c-21ee-42aa-8ab2-cfcb59f2b7b5" @@ -472,22 +466,24 @@ "TableName": "项目岗位", "BindingInfos": [ { - "GUID": "0f68edfe-fe2f-493d-9b1b-a0cadb94a4d8", + "GUID": "d76725bd-df60-4b32-9862-534682cc0373", "BindingInfo": { "TableName": "项目岗位", "ColumnName": "ID", "GUID": "ac894880-71bc-4521-87e0-944192ddb93f" }, - "ColumnName": "value" + "ColumnName": "value", + "Alias": "值" }, { - "GUID": "42b6e165-ae4c-4dc8-998f-0405e817af41", + "GUID": "b88bd335-29e0-4790-b810-371cbcaa6290", "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位名称", "GUID": "96f973ab-a19c-4f6a-b03a-c279f0ebf7d8" }, - "ColumnName": "label" + "ColumnName": "label", + "Alias": "显示文本" } ], "SqlCondition": { @@ -566,7 +562,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!O19" + "SerializeProperty": "=项目成员详情!B6" } }, "BreakpointIdentity": "6d05a9ae-2a6c-4c6d-a0f7-333e10924b1f" @@ -578,7 +574,7 @@ "BreakpointIdentity": "278b3f88-2d63-4a63-a68f-dd239a00d104" } ], - "ID": "d5391338-94ad-4901-8097-5d1fac3c5ebc" + "ID": "616ecd25-db4b-40a3-82a4-d322eabc5a81" }, { "CommandList": [ @@ -589,7 +585,7 @@ "BreakpointIdentity": "37d610c3-f702-41dc-9926-86514f7d7e0d" } ], - "ID": "bf084ce1-4dd4-4832-b5f0-fe09482ef254" + "ID": "ce26368d-7203-4ac2-8188-acdc151a5328" } ], "BreakpointIdentity": "1980cdd3-2935-46e6-8627-90e90c32647c" @@ -707,7 +703,7 @@ "BreakpointIdentity": "e853a4b3-3da1-4870-80cb-ec0e96ef68ea" } ], - "ID": "1eb01a16-ed08-498f-b418-ed48ed7d8116" + "ID": "041eb6d7-1ebd-4d02-ad13-706c707e515d" }, { "CommandList": [ @@ -717,7 +713,7 @@ "BreakpointIdentity": "695d48d7-943c-40be-90e3-b2ee38378546" } ], - "ID": "fd3ae9e8-5a62-4e7b-973a-2929c2710cc9" + "ID": "6154e6fa-d586-449c-8204-019c5d8e7cdb" } ], "BreakpointIdentity": "63733aa8-9f71-4f34-a9d0-2354f1d8af7e" @@ -810,7 +806,7 @@ "BindingInfo": { "TableName": "项目成员表", "ColumnName": "项目ID", - "GUID": "46b9a6ec-7883-4700-b77c-a46e716a5631" + "GUID": "a3c5838b-86a0-41ad-917b-a419cefc11c2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -821,7 +817,7 @@ "BreakpointIdentity": "21734a41-b805-4942-86d5-931da24b4042" } ], - "ID": "cc69b57f-383c-4942-bf35-8d12ab565b27" + "ID": "7e9c0f3d-680d-4ba8-a6b1-3eebca05e5f4" }, { "CommandList": [ @@ -832,13 +828,13 @@ "BreakpointIdentity": "850c3d1d-096a-4890-a6e8-05957a8456ac" } ], - "ID": "7a2ee2eb-303f-47c0-a06e-0d99278b7c7c" + "ID": "3c5101c2-7006-4062-97b4-c4451ef57a5e" } ], "BreakpointIdentity": "b7019b97-0571-472c-965b-b2ceaad5c98d" } ], - "ID": "dd09a266-2725-4c16-ae69-3db9509130ed" + "ID": "339617d9-a06f-4ea1-8d7f-f718ba38084e" }, { "CommandList": [ @@ -849,7 +845,7 @@ "BreakpointIdentity": "a3a11c27-c2e4-4b82-9241-9632ee32faa7" } ], - "ID": "411a30b6-12c7-453c-b22c-dfc433de6e04" + "ID": "6fc0582d-3fdf-4cc5-bde0-e9dcc361367f" } ], "BreakpointIdentity": "632f22fe-2395-415b-ab2f-64ef63924c29" @@ -874,7 +870,7 @@ "BreakpointIdentity": "7cede62e-c364-4c68-ab25-89bbdc2349fb" } ], - "ID": "d0543cc5-e2dc-4734-9a38-f0f405334bc1" + "ID": "ffacb640-bcfc-4465-b0c9-2cf3b543c17b" }, { "CommandList": [ @@ -885,7 +881,7 @@ "BreakpointIdentity": "34ba4eb4-7e34-4f08-8f3d-f69d9edcdb01" } ], - "ID": "5d8ee831-7855-47c4-87f0-bf9b05bb112d" + "ID": "892341cf-1ddc-4b1c-a1d8-0eacfec778f8" } ], "BreakpointIdentity": "bf21f622-6c4b-4db8-8f18-651ef1047c4d" @@ -927,13 +923,6 @@ "DisplayColumn": "项目经理" } } - }, - "18,14": { - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "岗位ID", - "GUID": "2cb28302-5ac9-4b82-8670-4d8b7b2da614" - } } }, "StyleDatas": { @@ -1001,6 +990,9 @@ "BorderBottom": 1, "BorderTop": 1, "BorderRight": 1 + }, + { + "FontSize": -1.0 } ], "Types": { @@ -1065,19 +1057,6 @@ "4,13": 1, "4,14": 1, "5,1": 1, - "5,2": 1, - "5,3": 1, - "5,4": 1, - "5,5": 1, - "5,6": 1, - "5,7": 1, - "5,8": 1, - "5,9": 1, - "5,10": 1, - "5,11": 1, - "5,12": 1, - "5,13": 1, - "5,14": 1, "6,1": 1, "6,2": 1, "6,3": 1, @@ -1192,7 +1171,8 @@ "18,1": 10, "18,2": 10, "18,3": 11, - "18,4": 1 + "18,4": 1, + "18,14": 12 }, "SheetStyle": { "FontFamily": 0, @@ -1209,10 +1189,10 @@ "18,0,1,4", "18,11,1,3", "13,1,1,7", - "5,1,1,14", "8,9,1,6", "7,13,1,2", - "8,1,1,6" + "8,1,1,6", + "5,1,1,14" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1280,7 +1260,7 @@ "BreakpointIdentity": "9ba118e7-398f-41a8-8561-4e94b3335af3" } ], - "ID": "e6f6a5b4-7a61-4fab-8ca2-b1035790381b" + "ID": "40bdbdb3-e209-4e36-9681-ae3ad1ecf9cc" }, { "CommandList": [ @@ -1312,7 +1292,7 @@ "BreakpointIdentity": "22865b09-f65d-48d4-9a06-92e9e9bbef7e" } ], - "ID": "e2665958-b0c3-4d05-87b5-69782a1fb443" + "ID": "0e5196c3-e409-4ad2-8cb0-42b03b5fcb63" } ], "BreakpointIdentity": "879e6884-a9b9-4531-813f-03b7e1d08157" @@ -1373,4 +1353,4 @@ "Formula": "项目成员详情!$E$19" } ] -}//kNu8k9qYjtw0bN7LM2Tyws3r/soJWPuXZpu1MEQG0q5PWDWZ0GoINYXb0qM3KOgcjGJe8w2GZ0NoYlQiym/9gviV1GE20OjDNGtBO/LtwZ/lXe5Cgyyy22iO22QHtFa5y2slf85v3xW2Vy/FioME0bbgmwU5Oi/UGcG2YcXd6Ai+joaFn9NF1rjxxivXyKgVIHscNPtwtW0MfJaybqZzVV3net6VyIVGviU1pvEzk/VvFLtzUkMdeJzONr/t0hJAB/OCpTrbKilbCdhVeNv5DJf2N7773KisUi7yld3PrDETTjwua/YN9plu09iye0wQMcIv6qmY4OCNVvP+N8szkvyjvX7rcsW1ZKVWx0+RUoR1Vj/gIeA+Apo2GMcOg83KBlnFqO3NfLseDVcZWPk8es4vInRQ7ZVe94vZAeiXof7tV0yQ6i5DbRwgsRn5WpC8yr4+vdyiPs3u1KwYRzZvzfeINRXJ6SXNYWw8QVD8jsinPUns6EIQ+Jb+DnTTC4uEANDwFUGwu3FOsfPR2IyFAWMdO53CZHNN9WGQZLj3T7sGF3q+va7GAJej1hdP8qb/D8VV9bxhNFm2oCbUFt2kGtiMRYwEGMzsMMTkeMiZefr16Nt2NH5CrUDZb43too9HdFdpF7gN20SQsI0MZRzsJfSDHI31HgUk3LQmS186n4kg4jNsF68cx5waxEOlUc1zJHJKgzVAmpoDeVlM0FnSsA571ixxs9k63twkq1F5+7JzfBZIBhElEYLv3bLxLSpuqB9ItbC7Ji8XgF5JGDXYUCL5KJEFPKdBlHmt8MzjDi/WgiHm/IP0rmhBuG5kuN/9uG6u+LO8aCO+mQ40JSm7hJbawAeUqeVfOx3LsVWDDTwa1Sci4+Dv3mIdwx0LtVjAv9VAlmHCitix/Z6/K9fIsQ==|920 \ No newline at end of file +}//v5umsZ8V4SeWcK33RjwC6DigM0L6KOC7ideLe7aUjvCiJ4Q/oKml3mgdZNXuMWM8L2ypy7FW4lNNnkYsRqZM69MUz9riRbH0qDQ7TBDJzshGYp0N2ioZYIPJU/i5GpnYS0zkYefRB+tvRYgbqytASpRyo0yf2S4I3icZUNRt9zT0SMqCgUHM5bqeFwYw2S6bUBK0RXm3y+DdNK4YZXTnntUAwFVk7BiiMkdTzuF99A3Kd33PfUSsB7z4DGdbl8PdD34zS+Sj61hwF7v9C8lyr5YXF9p+lGh2Wzf6sJ2noKfOyKwbWQAGefEFTS6MJmA6dHwMLRoEeB+m7sJ3sjzYNn82NujEg03kbC9sXvMc6cGMfnGc+5rLZ0jLGqUzgzJbAvRNFwLHICq7i4fAoEOEenHy3AiOt8PIKMtKm1ytJbULSaip3EK3GjtmvwyLTRpR/dNdfTUYXL26+Rvd3T15lWhl7gc8x8hR2zgyVJxADX7e9shA7ZA8GNisimTK6jM9x3BxJHKFv7bWlXsfzfUM2TOi30havMwW5ooCATu2/90dnQciHjKM+y8QbrdWKC50MaCCI1wMY3KtZ4ZyHYL5nc/MsbiK4xRWptqlVPTf79vIAHHERcK5oV+rCcZFHFlBGIwBGHTcW+aHlJEV7zdQrnXcFcsa/bIzOofFpFE0fSX4vJ+2Pvgdda7mMsDt4BjQxq6SHtXWJlNQKOWXGF9WCpeYjWualLTD3fs+xIOVXr8roPfmUV40uS8VJUe0q8DocKkyAgPg+sNfZ6o2nRxm7VlgioZ1W972zPVECKIzkc5u1yY64paC1KGVb8UZPYtRFpULBW8w5aIY6sJ1CnH5yeAyTBFlVNBx//QLzs6QZ573HnyjFRsXFJ5W+Qjgm9mB6kLlMlRyY95asZZ31bmsfg==|920 \ No newline at end of file