From 1cbf5e2593f8ebc0258f372e183683f319848322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Tue, 18 Jun 2024 12:17:14 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BC=98=E5=8C=96=E5=AD=90?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=96=B0=E5=A2=9E=E6=97=B6=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91","MessageType":2,"Modules":[{"State":1,"Type":1,"Name?= =?UTF-8?q?":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=AD=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 26 ++-------------------- Pages/任务/任务-子任务列表.json | 10 ++++----- Pages/任务/新增任务.json | 39 +++++++++++++++++++++++++++++---- Pages/任务/新增任务.rd | 12 ++++++++++ 4 files changed, 54 insertions(+), 33 deletions(-) diff --git a/.collaboration b/.collaboration index 2194698a..8582ce32 100644 --- a/.collaboration +++ b/.collaboration @@ -724,19 +724,7 @@ }, { "ModuleName": "PCPage/任务-子任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T12:16:49.9054405+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-子任务列表.json", - "Pages\\任务\\任务-子任务列表.rd", - "Pages\\558ca610fafc4ffd8884b819161bfd6.json", - "Pages\\558ca610fafc4ffd8884b819161bfd6.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-工时", @@ -756,17 +744,7 @@ }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-18T12:14:43.1009698+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json", - "Pages\\任务\\新增任务.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增进展", diff --git a/Pages/任务/任务-子任务列表.json b/Pages/任务/任务-子任务列表.json index 6e4f6ba8..c6ae50c5 100644 --- a/Pages/任务/任务-子任务列表.json +++ b/Pages/任务/任务-子任务列表.json @@ -180,7 +180,7 @@ "SerializeProperty": "='任务-子任务列表'!C6" }, "TargetCell": { - "SerializeProperty": "=新增任务!B16" + "SerializeProperty": "=新增任务!任务类型" } }, { @@ -189,7 +189,7 @@ "SerializeProperty": "='任务-子任务列表'!F6" }, "TargetCell": { - "SerializeProperty": "=新增任务!J13" + "SerializeProperty": "=新增任务!任务分组" } }, { @@ -198,7 +198,7 @@ "SerializeProperty": "='任务-子任务列表'!I6" }, "TargetCell": { - "SerializeProperty": "=新增任务!J16" + "SerializeProperty": "=新增任务!任务版本" } }, { @@ -207,7 +207,7 @@ "SerializeProperty": "='任务-子任务列表'!L6" }, "TargetCell": { - "SerializeProperty": "=新增任务!F6" + "SerializeProperty": "=新增任务!任务负责人" } } ] @@ -619,4 +619,4 @@ "Formula": "'任务-子任务列表'!$R$6" } ] -}//7p0q194lameCGzxEBbpnNzXnUAgJSMLt1/qQkZ9ZzSTfvCtDtPRnZiMkAjMyR8oGBRzaV0UkGITRgmkNtm+nAGnkqhF4hL13HEj1yphcwQ32nfHpYsqkxVSTv5U9rwV4bH54MwOGZbyQ+V12/JdkmFyEx2VHiev9h1zmjZ2sS1YQr8FTEcI1Il3fKkEiPyqna3qMeGOXP1myjlfEUBAcCsJOURHjFNtg4iEalmMcION8lt9OugZm7AsEl6cQcOmWk6qq8IqmUxWA7DWz33fsnHsKtV8BpNJQMCqsp9aebCME4WjqBExZ7ipM43GHIYB4vLdonpECAHHVVcVjhQMHNHbmM+/eK4OUSk6W+PaJVLzwpKDHfNeL6at93pibUmqETAe9M4xvJQwhMBRJuPw70PJ8wQXGDmfPE2Eo0ZBdrbGvs352fJ+MXbnddrWobbaa7dChs0mNfdCxnd6qIKW8IPcLe447pSI/8CJ22iP1C7oZZCmiu5emOKOwYS9qR4Z2MReWlUGM5PjpM/FUTR9725iuiyNRL9zMbME9cs1l6xryGNp7huoWhgz4dNC6X7DSbyo3YFDPxmArbyPg7h3FIQbj39EzysAP60ZvzXdA/OPbGR9SNyOgUUMfe0mmW09h0CJJLVpDsSHA+uRIoiZNnf4IqspYglnTkh5SF0i+XIDes3zGb/VteTdWliHsdwv2Pg6ljB/pqCHNISqMnhxRYQpX7m25+eYHnz9nxJLtw2NSSPbYCoi2/B4XA01n3qasAJy3ABUQmhdRpwYV2PsKEDUqWgZH/oaR9Z6nrpOu15lC7XvOJ7sSSi3gEtUMQGu9owe9LQfvmESfXtnK8yHP/78gHKJycsy0lWqXLb9dIU5quaugXkmBGQpeqI1W6ZUzfFGDZCcrli7p7XIzlDcJ4w==|920 \ No newline at end of file +}//CwuLhplzw3I6ZQmoFfOKTC/tVcrZKLjHDUD9VRExbj8+7Izzf310iqnLherPN1njRXJbEdVaTANSGEGCSDJOlqQpvSs8whY63a6iXLtXUcrQ2vwjDF+MaeszG1o9ufOSoqymoMq0yfPEb0pV6qP+EKzLmi/PN91MqLbGz6PiOlpdbT3jxLwWZ8RnmKZbtpE3+51bhYMO6D25XyXRF9bAOO1VU6PVokzb4lzFalj1vMU/igJv3NO/srWIsz8blIK1x8AMiCop+V0zB5euXi0LkVAaRm2vBu0esz2dSKYwv6bnq45oFEf/mfrjaLRCptbsO6UQPUy5puKkqsXudQ7Tg7xrvcd2TUWF6S57gI2rucDVi9SvTsUYK92w3tfxN8/P4p1TgpmyksZju7VEDW8AJqYSA5p2GOV+7iZ6IE7L19MKseP0a/En+J1q32ln6YlNMeb00jpaLacQhmHg9QOrf2De/umkUKqRDIHI5lsNmGcHNc0rc084cwDZqbMWmkp+311+Igh29kusTwVsiLDqUN9DDBt0p6jrqqTsxQ53820rWXFKDOCLKsKQs7lvVtAZmUp217kdZT+h8XQYhWA60BwICcVTu8n3YJ17Ki38MaZh6GzT33Bt5aH6Dm3fxJDE9p9AElpzcMVBBguaMrKvUDcO5PPTo+c+rCSAnW8jSpoAy6xCjBnUeamsob6jIloCSSIzAA46jcp1+mJuRGKgG4xSVbZS+6FVtkrhsxqkMxSIIhGD6LqaGUsA2gnvq/kqoj9WFq+JZ/VkRvRAjufrOpTJw3dyMSeWNVWW4bYKo7IuvgYeyZwlnTq2RqJa8mrFyo8Cw0nZ4ssSRJE8k1FOAmS0hZKF0okxKitolw1JHauFR5669AwCp4kc+jbArA8K6IIM+Ms9oLvQcGprY5i97g==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index 06564d08..9b77f184 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -698,7 +698,10 @@ "loadingText": "加载中" }, "noMatchText": "无匹配数据" - } + }, + "RulesGuidList": [ + "a70ae972-8614-404b-94fd-e3bc8cc2fa5f" + ] }, "14,13": { "CellType": { @@ -1612,7 +1615,7 @@ "MethodName": "Focus" } ], - "ID": "d2307cb0-643d-4cb8-a8a4-50fa63df849c" + "ID": "38995bb1-b541-498b-a4cf-989753c60a41" }, { "Condition": { @@ -1646,7 +1649,7 @@ ] } ], - "ID": "d40eb957-42a2-4fe5-b519-a71318a6e4ac" + "ID": "936b40b8-1ae5-4579-b9a6-e6a49f1d5840" } ] } @@ -1684,6 +1687,22 @@ "IsDisabled": false, "IsInvisible": true, "IsReadOnly": false + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!父任务ID<>\"\"" + }, + "Priority": 1, + "GUID": "a70ae972-8614-404b-94fd-e3bc8cc2fa5f", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": true, + "IsInvisible": false, + "IsReadOnly": false } ] } @@ -1712,6 +1731,18 @@ { "Name": "任务负责人", "Formula": "新增任务!$F$6" + }, + { + "Name": "任务类型", + "Formula": "新增任务!$B$16" + }, + { + "Name": "任务分组", + "Formula": "新增任务!$J$13" + }, + { + "Name": "任务版本", + "Formula": "新增任务!$J$16" } ] -}//i+/1KU0osCvvZAVPk9cgyxQJ8c/96fvx+4vCU1bsckTn4+RF8iJAv8d4txDSSve5piN5bDWBhoCr8Ol7DT/y+A5JoFBwuLTDl2QOpkB6dl9VwwbdH/D7cJZo6CQhxE48qzX+ZppJ+1ajlhSZ/+hn+0eAt8EzVbFvF+SPZ0xRnTM2A3IbePc4j3VPoUhYJ2j/Vmv8LF1r4bbJm6NHHY+cMEpUWninQRlXC47maVRdNif1lVssYXyQ4qU3Z8ojW5EdV9V00o65KOHXB8tnVJ4eIYtHlO2QkaUYPw7T44HM+54GvjqoGm7ffNQ0Ft68tq4l8SJlssOkCxmVagx/TYUxA0XwxjpdRUVFO5oMknPBQ+eF5nofjLepGB3jz3XdXCuoqSN4mikc5rbEyClbQrD2fGbEh+gs+YgU3zHXRw2ActqUc0LaTxRwCSjMMWFtizohaR392r/cUg2WmB2S4tiyml3NfmviHryo8eee6i2LS5JDAIngKON99ukEyS959WRT7PCgTfulFHU37+6XXoOnB8ZHXv4epexciSfsg4ipJVnJ8NuNOBCEjTmhP9WC0IK+7Qe5b/3DSi6I7Q/UyIvCfo4Z7lJk1pLBokhjsQ6fiAAvKhBhTbmZ+cSYEWHLc+Fs3bGGEgNeTyaxj2R/wY/yAfY/f+1zc9+H3ar6ZSofIXcQbvKWg3vkPTYv5KkH2eFX3s6cJ3cqRxtvr2+ku01z8mqsa5oWr970oKucLPV8qtzyASVZWNbl4TBqjeM+k1/fI9qZlElENm/FVKc67ZhKt5/KCql+FDzX7SJLaF6nHnRNwDDtb3PTWv5t9d2EmYvNAmxatuNh8Bihuybu17PbDK+DJ7VPu8As2pS4CP6938R1hXq62uANkrqBuyDytup+MYvFya2ouE47eRAVVe17+Q==|920 \ No newline at end of file +}//QkD4e7oyR+pLUhN2QPbyBUL5dJC7ObLehKGcgFhqxNApauq2FLy3ZKSjgN80GiBiM7d07GC9H8yy1q23TCNAb7iD2dP++qBkHF4PfFkPklNI2zBMK7OxJIByT6O1Q6KuGIddoS8hdp262eDc+ZKx3xPvPM3W09B8RW76F2269YfKNVmiyAox8FdfurHHv9TQw+KsF0eqRjZnGuKKxm1Ib0fUHQ2j6vdSVxYZt7ELKkKQgLCcY7s4KRXE7wqJOuUh/Dm8OZ8tIRO3mkU2Z5gsK/tqqqZS49Lfn7J78CLCOS4k9dLH4QlCbop2uaqqP9dLEe973NYHecxZgbzObJdoAgoYAbTC3k9N7KvJtTxaRgMdTT2K6BfpZ6d0nIdFsJ47l7/NQVBjbZipdCx07qM98phQ5TYymGDSLnLWPvNjA3SeTi/uyyniWBpad1CBolHRlw4oa/Bh7QaEGTloeASwwnTHav3g+K+YMzcXRog9CnTFyo7VdE1vTC2jgAEHqGhp3cHnRLnVWd+hahiiMfOhXDPSm6KdyYv8/geffooLfzMp4AiMvlZPqmhT9Cw3iD8vX8c8RPQ7WMw62g1ZOYI4a/SZ/Ln+dyuJIFYGTPZR58VLce52fhnQ2WCQjVcNxbk1jRgZq6S/zK4Zmx/4O/85UeJADzpzMiLyGfxC0sG35Rn9RXEJgDoKUVMG47SoZDcjMOc3fwbYUBca2rKdpc/hOzyRV6SHgJStJWq/LQi8IxJgyJ76wChjdVQj3cm+vi2RprJxbPZnO0PXbAdGTHnLPbHSFpmJqZs8T6bvTqzT78oqL1T8T+WFywVIyxnAtM7bahlGkZXZakniAGQoyCjIbQDBOlhsXtK/jo7yYmZ36lhFQS1+kDkkPGc7wRUig0OZEN+E6R5yFqDFRImOX4gs/w==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.rd b/Pages/任务/新增任务.rd index 49e46d21..e6216c51 100644 --- a/Pages/任务/新增任务.rd +++ b/Pages/任务/新增任务.rd @@ -27,6 +27,18 @@ { "Name": "任务负责人", "Formula": "新增任务!$F$6" + }, + { + "Name": "任务类型", + "Formula": "新增任务!$B$16" + }, + { + "Name": "任务分组", + "Formula": "新增任务!$J$13" + }, + { + "Name": "任务版本", + "Formula": "新增任务!$J$16" } ] } \ No newline at end of file