diff --git a/.collaboration b/.collaboration index f4c0aa2f..7f198eb6 100644 --- a/.collaboration +++ b/.collaboration @@ -662,17 +662,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T17:01:36.9775798+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json index c21611f2..69dfa925 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json @@ -2064,7 +2064,7 @@ } } ], - "ID": "9db6afeb-7a9b-4a2d-b26a-f63c25bce2a8" + "ID": "6c89658c-31b8-4f05-8ec9-c5de68fb839b" } ] }, @@ -2103,7 +2103,7 @@ ] } ], - "ID": "4f3cc934-6f43-4af0-bdb7-fb94d660729e" + "ID": "1af59b88-f9f5-4369-aebe-8007d62ecc32" }, { "CommandList": [ @@ -2120,7 +2120,7 @@ ] } ], - "ID": "d83900c0-133e-4703-aa89-d2e2a7165eb9" + "ID": "cc46dad0-362e-410c-9393-d55cb8a6d7f9" } ] } @@ -2164,7 +2164,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR('任务-基本信息'!任务ID<>\"\",'任务-基本信息'!任务状态码=2,'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户)" + "SerializeProperty": "=OR('任务-基本信息'!任务ID<>\"\",'任务-基本信息'!任务状态码=2,OR('任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户))" }, "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,'任务-基本信息'!任务ID<>\"\",'任务-基本信息'!任务状态码=2,'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户)" + "SerializeProperty": "=AND('任务-基本信息'!工时分配方式<>4,'任务-基本信息'!任务ID<>\"\",'任务-基本信息'!任务状态码=2,OR('任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户))" }, "Priority": 6, "GUID": "f7c3f6d5-8b51-481e-abe2-d1a7b9beee5e", @@ -2339,4 +2339,4 @@ "Formula": "'任务-基本信息'!$C$8" } ] -}//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 +}//9SnK1Bf1EdX/KW3ai5n1RChmWdboEEOe6wcWkUvwos4UyZW5AmPl+6tlKFCyk6udNTN6apNTiMmDGGqFUCRc2TD3I3aYFgyUpU3qtwYi/A7bUGaxVBJfishi3U2j5iniCd+1AWi/uirYslwmlkTuBN6P2dxX3pxoFeTVGW1BgIDRUdUtrHmKSGcQ2hGRHo+iFd8FRRcVlz5ywdM3j+Hl2RBVR1gQt8nQV2NTa7t+SV9to5c6YTRNUKRgq6KRDZT8qjH1SpG/nB++JxOVE43SaTP9JB73eqUZgFyqQH9/0KAxbsMjKSb7mmSiLcZRekVk8irfoqhRmQCBRlktUI2L4XPi7V68vPehusxTeENOBcR8n0oUeIdPMWqjHpr3J22M03uH35jjeidzx6kfmevZmaYqVj8rjki47B5XzK26J9zCLJnx04GqwSyHZKhrLj7qU0qSpm22FyjOFoDAJLAyPAtdhW/TSt9LZAnUNmiLdxrPi5iVeOAlRcIUqqpeDaswJP3AipCJYnd45v2CYjY0/96aLM52hT0ZINg/1tqBvRkA2qDBvrSfzUAcXQlRoMZilf3CK9rKqGoXm/3m8xxEnBEeBZHbo74KgzcYWHEO9BiYNY8IRHn1Ajmn57m5rDSX7IJzFUOWisPB3XaLRsH6eEzHopA2MRGUW0KW8UMYdgpxbEUwt8hqQhhV3oxoi8fkZGA4aEfLT+crVYa887OTdcMY7HwS4nmy87bMUfemwB5P+RHmOPfVUFbMfBm6N36wlqnYiFtNgIqL97Q2GQsPKYBc7HvuQG7l4oNAVpMH07jOvs3YSAn27ZMHHGTNRLnWxUwZtXlrgjvcFtLKSDz5nXyeisN7CqSKLJnEmBw1P25Hf/ZiYGjwZc7npfKKxo9SCllzVnRa/SShmYFDKKoNwA==|920 \ No newline at end of file