From 8f626e432649583c9a3a1e99a20d4893e45b87b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= <phoben@qq.com>
Date: Wed, 3 Jul 2024 17:16:31 +0800
Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?=
 =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF"}],"Version":"v1"}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .collaboration                                       | 12 +-----------
 .../项目首页-容器页面/任务容器页面/任务-基本信息.json | 10 +++++-----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.collaboration b/.collaboration
index 31e64790..7f198eb6 100644
--- a/.collaboration
+++ b/.collaboration
@@ -662,17 +662,7 @@
   },
   {
     "ModuleName": "PCPage/任务-基本信息",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-07-03T17:16:23.4552477+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/任务-任务信息",
diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json
index babfba38..44d380f2 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json
@@ -2061,7 +2061,7 @@
                 }
               }
             ],
-            "ID": "9d35de19-e1bf-4e60-9be0-c6edb4e16a79"
+            "ID": "c366737a-5af2-4c16-918e-1d1fee81a6da"
           }
         ]
       },
@@ -2100,7 +2100,7 @@
                 ]
               }
             ],
-            "ID": "c29d5717-01a5-433b-8a26-57f813a0efbe"
+            "ID": "0eb85437-b2c5-4683-a6aa-848409fc348f"
           },
           {
             "CommandList": [
@@ -2117,7 +2117,7 @@
                 ]
               }
             ],
-            "ID": "3e7286ad-4e02-45fe-b73b-eeb2adc5bda3"
+            "ID": "6d52fba9-f6a7-45e8-adaa-ec8218b2d9ea"
           }
         ]
       }
@@ -2177,7 +2177,7 @@
           "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
           "Formula": {
             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-            "SerializeProperty": "=AND('任务-基本信息'!工时分配方式<>4,OR('任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户))"
+            "SerializeProperty": "=AND('任务-基本信息'!工时分配方式<>4,OR('任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户,'任务-基本信息'!任务ID=\"\"))"
           },
           "Priority": 6,
           "GUID": "f7c3f6d5-8b51-481e-abe2-d1a7b9beee5e",
@@ -2320,4 +2320,4 @@
       "Formula": "'任务-基本信息'!$C$8"
     }
   ]
-}//q8+ghnHCmMJAjgoO68lv1wT2P74xaqldy6QpJ6OvNZX7ytsWbPeQ1SLWjQg9bx8WXCtV8wuJ3etWS8ib12k5/SCdaSYkWWldY5AEg3C35saUHFWbflmL9yI3UIWq6sDf4uPqjYaumS63OaAJEQCxNkFWB2QlmKG2AWIQ6hyOstTDuZjCiQrK0dcvoeOIvXj366aBmryu96OPBbwft+3A60Svqu2Bz8U1Aa7NIUK20opbpRD66vME5DNfq7A6kNtXX7rQuVn4z+r02nJsV9KktifanB/1WsBR5JrRW+YnZcyRxWy+UrmKgt9WgwPAUej8Rr95Sol2naRGhfRhBwJMwmKGpHPPhIBicU4tDA4Fkyji8WV9cefVAvGdQsz9YNlT6QQ2YK/YQNfM8xF5BRvKtf6L/UDkxLb4tL0nZBxzeaH156UKrT/2V5TTEJWc5Cu0L0KCUtnxivUsRnC1FVKxrQSLvtLEaLe9WV5LknPFyE7WXIZt455GYrYRBn/Igj40O4kTUj5rleQRMH2q/oWQ8N2dQ1pRlK7FDEUDmohihiaXT5M0MDmsV4BNzLENSIgROpY+/T1ElK8e7BeK+KUCC3xnh+7ASppe+d0tONrHt5xmcp5VODVPZxOtWxr8OUwp5b+viAbWunkMoEP9A3k+0AdiZlcLbCq+zdINywCTrNdZa9x0AY3sbRlYetXWoHF+xdxe0Q/IxcUsaJr+S9514Int4jIlVmsXQG9L0yrpoHmL9Oh2M+Hwa83QTvC8sFBAgOJMIgi8gID/r1tGLCXxeC8TNxA/W7j2s9rtqJYotShqk7/ioDygh853Y86mwz13tCE+nDBLhFeAmVMCeuw3QYnSLiqBMzGWLBbj3s0RmqUY5+MfOT5GCtzqoL3gC4mMcUOOkxKr3XkVwwgLBrVomA==|920
\ No newline at end of file
+}//Z+3dWLy+wyEdFTowjRxkNN0+uGbywSvbTgIRRpkaET66a1KiQE2XTAGW6Wd1nMC29Ovlxs1WUrYk8nWoHInlWbexRC3MECWVieTLdUCqY119f7SbYkGCQi0pKB8+kndHWoPnOdzKpoZINCar10C59POrf0cxkwVWhIk/myri0Doph887Rbk8WKNwGUKKutFmnRayeLlp7fZRzDSoSSnh/a41nhbaS0oCdshsN5dKRuMSnJxXA388AtVhOITHjPBCv4wvlgSzR0Zi7olU3ze6YLQI1XeT+Sfi5l2LGnEbUig/e47dvf3PyzYDAnxjPdvEMBUFzD8iq8bJdvcw4mk50AwfvZKmYp2PnoRrRnPWpgKrTapcwiWFrjYZauE5aYcNb02DEcHSDoOwkmc7r52da4xez2Fnztg7OeJXaWlTRVDpmnqXI62zNomVwQMxECACshHU1ccvbds9vze4sGAJb7ddAj50djL+PnAnBX0HROHzxMq2CApPGD8KxqbKdslfWXarQtevZWFAd+rdi6i4AKoY8P7Di4n3E0GcwubhJ7+2zvcoR2auMCpH5jS3JtZsYbJSsq915BiAuTVPetAkvIY2gV7ti3HXZbN7HOPz3G5Q/4jJHcMcMo9nyfOFIbvk+RbejGOZEKQdCy3yBzspQYXrcpVFJjSv8T/TFsZhr3yQXhl6BmrNHn557Y4iO7nJQ92u964x4YcsbslhIXewZqY1OFUrx0WafzPfgJzgkUlyu0Xwade3pKeU91o1Gk6WiZVwA9v3cTR0YilZES0wPItfZPqaa2P3acPeKmhS2d7qg8YPwSeiVsSRNa7y4CxuYU2OT6CdvoNBMaZNkEe+r1LXmpYQYLyHgCywBDfdTJExK1kHjuFD8O+Y4ghPguKl7pXoctLK3hsC2JmvTHbTkg==|920
\ No newline at end of file