diff --git a/.collaboration b/.collaboration index 288dd876..7f198eb6 100644 --- a/.collaboration +++ b/.collaboration @@ -662,17 +662,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T16:56:20.9699368+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json index 980d2837..c21611f2 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json @@ -305,7 +305,7 @@ ] } ], - "ID": "71b6d37e-f897-46b0-b6f9-bbe2941b6c34" + "ID": "69f3c452-b130-45b6-9af5-82f8ba31b4db" } ] } @@ -444,7 +444,7 @@ } } ], - "ID": "84141b5a-d7a3-4cfe-ba99-785801036d9c" + "ID": "31d98b97-ff81-4073-9816-5528250bc6f9" }, { "CommandList": [ @@ -459,12 +459,12 @@ "BtnText": "知道了" } ], - "ID": "a8883b34-ae55-4ee6-9160-483af9b50d9d" + "ID": "c9757693-acbb-475d-a8e8-18c5aed70a8c" } ] } ], - "ID": "e15049e0-d9bf-490a-8ea8-f048ea176b20" + "ID": "47aff9d6-dd65-46d6-bbfa-df0351f5dd0b" } ] } @@ -477,7 +477,7 @@ } ], "Comments": "小于进行中", - "ID": "e57f3250-8603-4b4a-aa00-27846f9c51b8" + "ID": "eab6786c-0230-4918-9166-96f809f03ef9" }, { "CommandList": [ @@ -487,7 +487,7 @@ "Message": "任务尚未审批完成,不可修改状态" } ], - "ID": "f2041ac2-c3da-47ec-a5f5-70d1aeeecf6a" + "ID": "6c622203-a52b-42a0-ad20-b8bd8f3da202" } ] } @@ -586,7 +586,7 @@ ] } ], - "ID": "f9288020-f0fe-4d79-a9b4-f558bc206dac" + "ID": "fdd49b10-2aea-40c1-9276-087111754fe9" } ] } @@ -766,7 +766,7 @@ ] } ], - "ID": "8e17ca22-e1b9-45a3-8130-00c4893e14ab" + "ID": "a03a7e25-8749-4fab-8b10-58e6fb5c01dc" } ] } @@ -1060,7 +1060,7 @@ "BtnText": "知道了" } ], - "ID": "eab6d269-4bf9-4c24-ab4f-373eab5b63e4" + "ID": "a11a87f9-785e-41fd-b84b-4bcc27a3c566" } ] }, @@ -1074,7 +1074,7 @@ "Title": "计算中" } ], - "ID": "553c5cb9-fb23-4e12-afad-a590608a9fbe" + "ID": "6aaf044e-4607-4d03-9f0c-8122334eee89" }, { "CommandList": [ @@ -1089,12 +1089,12 @@ "BtnText": "知道了" } ], - "ID": "166d1c2b-b56d-48fb-bc32-950013c5023c" + "ID": "65ebe967-f0b4-49a5-a2ef-7129cc924512" } ] } ], - "ID": "0321c36e-9758-476c-a326-3dee7d0080d0" + "ID": "cd3068c9-df6d-4fd8-9cd8-cb289297745b" }, { "CommandList": [ @@ -1130,12 +1130,12 @@ ] } ], - "ID": "fd1845c8-8b93-43d4-b959-0b9524be8fc1" + "ID": "ebed83ec-9e43-42e7-b6c9-3a1a71b7e4fd" } ] } ], - "ID": "47dae6fc-e5ea-4caa-82b5-44d3546ce6cb" + "ID": "06c02e4f-ba3e-4335-96e1-cb498edb19e9" }, { "CommandList": [ @@ -1145,12 +1145,12 @@ "Message": "本项目已设置为“不分配”工时模式,无法修改!" } ], - "ID": "31e6f8f8-f8c5-4b57-9949-b56103883b75" + "ID": "3d9f5aed-5984-4c2d-9b17-26af97414b8e" } ] } ], - "ID": "918b0230-4a3a-429f-8b9e-40bb817662cf" + "ID": "cf28434e-58a9-40e0-a823-12e91ca9add0" } ] } @@ -1260,7 +1260,7 @@ ] } ], - "ID": "df10692a-4168-4f91-bc70-672cfb582636" + "ID": "f370c602-0e61-4fbf-854e-1a4f758ce197" } ] } @@ -1414,7 +1414,7 @@ ] } ], - "ID": "62d155c6-1f43-4351-b5f7-4cf5a60bdd88" + "ID": "987f3352-2e6f-47e7-9184-5504a274e05e" } ] } @@ -1578,7 +1578,7 @@ ] } ], - "ID": "f0aeaaa2-82aa-4fff-a980-13f712a3be2e" + "ID": "46f42b81-f56c-4bd3-aa9a-f40d7349335f" } ] } @@ -1686,7 +1686,7 @@ ] } ], - "ID": "5caefcba-7658-4ed2-be4b-2f5fe9576dbb" + "ID": "699b25d5-b376-48a6-a1ec-0b268672a27e" } ] } @@ -2064,7 +2064,7 @@ } } ], - "ID": "93ebcbc5-21aa-4dc5-8106-414caa32b571" + "ID": "9db6afeb-7a9b-4a2d-b26a-f63c25bce2a8" } ] }, @@ -2103,7 +2103,7 @@ ] } ], - "ID": "a378d0e9-4f46-4d77-8405-060dce955db4" + "ID": "4f3cc934-6f43-4af0-bdb7-fb94d660729e" }, { "CommandList": [ @@ -2120,7 +2120,7 @@ ] } ], - "ID": "29a212ee-62dc-40a5-b76d-fce5bfabb53e" + "ID": "d83900c0-133e-4703-aa89-d2e2a7165eb9" } ] } @@ -2164,7 +2164,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR('任务-基本信息'!任务ID=\"\",'任务-基本信息'!任务状态码=0,'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户,'任务-基本信息'!任务状态码<>1)" + "SerializeProperty": "=OR('任务-基本信息'!任务ID<>\"\",'任务-基本信息'!任务状态码=2,'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户)" }, "Priority": 8, "GUID": "afb042c8-a4d1-42ef-be1b-21a92da752b8", @@ -2196,7 +2196,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=AND('任务-基本信息'!工时分配方式=4,OR('任务-基本信息'!任务ID=\"\",'任务-基本信息'!任务状态码=0,'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户))" + "SerializeProperty": "=AND('任务-基本信息'!工时分配方式<>4,'任务-基本信息'!任务ID<>\"\",'任务-基本信息'!任务状态码=2,'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户)" }, "Priority": 6, "GUID": "f7c3f6d5-8b51-481e-abe2-d1a7b9beee5e", @@ -2339,4 +2339,4 @@ "Formula": "'任务-基本信息'!$C$8" } ] -}//YIlooN/HdpYyvj/JXiqb0aXQYarh6aOH9vxCUVQx2gDQV7Q5InIVvBdzv4ACHgjQSOxkaqIpfm3bt3TqlUUYXx2TlVGW8+vfWEOvMgbZZkpq9RHYkr+4UBcUotlMV8rdOqaswblCXQlasnHqvss3C0IY7JNS6eIbRxfNenB0vj8rmdo6YHD7IiqGtTwqZoW9c4kuRWc4M8VUr4E2JV2QxUcFiVBxsGRNIr9WuIiEMbL0DwMONFuR1aX6PVVa68uya+joHiU6EFNPmLf2p4NQf280kHx3cgabHSTyEFE09Xnwl4tZ7QaPmVrPxd8RnsjaFtqztlX9h8Oe/a5gYZZLTiQ4G2g1kI2N0I1RaC4OFQHfmZnKPjmYLWmaJpbci8frzs5AUQpW08tsR0h9CJRWyI3WRFNmeNFMlwJOz2PleOZ6cc3J2VWs8Cj0mr1r9XMZyPMIjZ3pffu59AXigT1FomvZl4R+V4iWSIm923tzAwYdnDyF8VIp8piO4iqNp5NCuOUM5tEpKjXt7yQbp2PWbKYRHawW6F58bdKQEoeoWy7JTSJRZ6oINWeqA244f6Ch5DUuiWK4mpEeXN6uaMXBvnEwLr4585h5gX1eYXWzQpNNAbtF5qe5B6ZbLavqISXpkHwqqnEqe8526d5iJteHINipGNmc2aifaRdrv5th51wX6XfSVmPBNEE+talzyyWDVmoMwmFj8ueMGrpU2z/8ykMwYViclMXMb/scrHiQ8qXOd/Qd2YWqfOeD3CQO9l4q0dLukn902AqNRJFZim7/NhUcqPmb75UDMXBmpK/vpdBqtdVthxwUij1Fj2u1P83kmnv59JGoTHqGr/11w0nyIsnBKjlDbvbqKIEbcwic+XijBezZSEXpPiTrp4v7mz93Uy+K9bw5iR7OsH+1fI00jg==|920 \ No newline at end of file +}//G09G+lPxRPqvfwJv9+1OpWW4yWsleKvsXJMUjSmdvMxQ/PZM6aWU2WJ5QmOm+OoI/A1v6x/KLHDFpCsuG5oHmhh23xGvIQd8ZFAsdqbIJataCPU+fbjSxqXMW7pdtirTlSY02nsHeZjMsuQ9mzr/whO5TxChMkjRar5XktYuwa3zulbJj/+Ss4rDDuFmNA+RPEUIIkws5PJ07r0Urj5KCNrjiwOEIKuRP5II3bSEIsvNXro1CZ3C1GhZnAq/ODZ5rQEvoJ2lkXM/k//4bgyJbWhw2JZtF/eerTXdAS6JKBqUqydOtq8zM6QVNY9TvJJHOzGQuko5WIIhmlNS5sP95s3412U9d1aA18azku30IEze4Gu+f3Z9bw8PTVkEPRVaXVVZlbeR1Sx6UDQUbyuaq1XU3IEBuFi7Mjvw7YQ6mYh/a52ulXVCBObCVgTH7GFdQkZP6J8jNGwQGMsTOXdBVpVwHrBWQKJntRrZDN06aeAlNQITCWU1fcNgnwbLCcR8FoakpvgYtBy4uElQlNH+EdYRXqlWGgclYNb9t9EW6TLBDMaIsoCuQw5pVFtu76lfr4uezrlh3PsE2diHbVJlzg2cIEeTtN9PRFXqZ5/82jJynEbHj/7DE0gFkc63/kOM46aYBke/X2f3BIkNXAOaljao19NyaMQsyBUyJYsWTuVFiQqcQbltCWwgy/7yl1IAPpv9jrid8ig2B9w0ZMrzlFhUAgwvMnWejHLr2tMj131O/bt8q7zswiFaDrbJ/Z3++yWEn14qeU0EzEqOV2GnUaDbw7U+6YHvYj+GuGZQjc8C0JRTm/OuoraAVdhwk8nXqpydtrwP2UFe9Z8KH56db36da268t9ubnFYYEnZUhA/go4ASQK5eIdSsKeJC9wH5wHx89GX2aLZl0U/ijseNvQ==|920 \ No newline at end of file