From 9ab27126a84218801f06e8d02f040a511716ef6d Mon Sep 17 00:00:00 2001 From: cuckooent Date: Fri, 18 Oct 2024 10:14:47 +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=E9=A6=96?= =?UTF-8?q?=E9=A1=B5"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 12 +-- .../项目首页-容器页面/任务容器页面/任务首页.json | 92 +++++++++++-------- 2 files changed, 56 insertions(+), 48 deletions(-) diff --git a/.collaboration b/.collaboration index 00795b7c..323f5ee9 100644 --- a/.collaboration +++ b/.collaboration @@ -578,17 +578,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T10:13:59.6642376+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目周报列表", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json index 99d66996..b5443f15 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json @@ -345,12 +345,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "ce13e5fb-6769-41e4-8b8f-f0dcf311304e" + "ID": "dd0fc613-8b79-410d-9e75-2b4f0f49de49" } ] } ], - "ID": "bd5ea903-b268-4f5f-9486-5fbc0e8cad91" + "ID": "79dff528-a082-4347-ac84-66533bc3a3a6" } ] } @@ -398,7 +398,7 @@ "ID": "e2e848e0e72d48229c97757429d446a2" } ], - "ID": "58a155da-71fb-4d10-a1cc-94c7c49b472e" + "ID": "a8a64d9f-f532-4ab4-bf25-4f8dde22db23" } ] }, @@ -609,7 +609,7 @@ "MethodName": "Refresh" } ], - "ID": "969b7bb2-9564-45ff-b3e3-b71fdf8ce206" + "ID": "dfb01b6a-c098-4fc3-8828-abaacb35e146" }, { "CommandList": [ @@ -624,28 +624,46 @@ "BtnText": "知道了" } ], - "ID": "7bc47725-f228-4f2e-8184-9baa44d40938" + "ID": "86382a1a-eca4-4630-bfd1-e3f1e560e8e6" } ] } ], - "ID": "bdf8d94f-31b2-4751-bf18-9a16128c4dfa" + "ID": "f51d5ab4-4d37-432f-8f44-b6a9b9176ea1" }, { "Condition": { "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", "SubConditions": [ { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "f06b7465-cf64-4c12-9538-ce24dabd73eb" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "f06b7465-cf64-4c12-9538-ce24dabd73eb" + } + }, + "value": "3" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "3dd8a6c2-f5d7-44c6-8aea-cea7b92d1b41" + } + }, + "value": "4" } - }, - "value": "4" + ], + "RelationType": 1 }, { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", @@ -653,14 +671,14 @@ "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", "tableData": { "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "3dd8a6c2-f5d7-44c6-8aea-cea7b92d1b41" + "ColumnName": "流程实例ID", + "GUID": "6426192a-8ea9-437d-9fc7-08a7471daa7c" } }, - "value": "5" + "value": "%Null%", + "compareType": 1 } - ], - "RelationType": 1 + ] }, "CommandList": [ { @@ -768,7 +786,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "8db413d1-d466-4946-bb44-a26ecc978a28" + "ID": "05916bfd-202e-4935-aa0a-8251e5b63549" }, { "CommandList": [ @@ -781,18 +799,18 @@ } } ], - "ID": "f97dc843-df1d-45d2-bb88-acd36957408e" + "ID": "c667c33d-3b24-438a-982b-42e29974940c" } ] } ], - "ID": "e1be8051-f92f-4be9-acb1-18c13447efb9" + "ID": "4959d3e6-ad5a-4790-898d-8def43e62275" } ] } ], "Comments": "如果已经结束，可以复活", - "ID": "cf6abb1e-6ac4-4352-a836-8c88a153b66c" + "ID": "5e71fc76-3cf7-4edc-9539-60577d20156b" }, { "CommandList": [ @@ -802,7 +820,7 @@ "Message": "当前任务正在执行中，无法启动流程" } ], - "ID": "f0b731af-9ad0-405a-b81b-ce28b9344595" + "ID": "b6718df7-a845-4154-9b48-54d3487f66e3" } ] } @@ -940,7 +958,7 @@ "ReloadData": true } ], - "ID": "35d9430f-9751-4818-8ffe-6028d02216fe" + "ID": "e276d9e0-a670-4704-be8d-9e74e78f44fd" }, { "CommandList": [ @@ -955,12 +973,12 @@ "BtnText": "知道了" } ], - "ID": "65af7d6f-f984-4536-b1b0-0bab7ab0a366" + "ID": "939e04f7-cc0a-46e0-93fa-24101a14cf83" } ] } ], - "ID": "cf5b0bf4-6ee1-4a7e-bd8d-96beda1d7e31" + "ID": "d3aa4088-3dc3-475a-8ad5-d10c1f71d9f4" }, { "CommandList": [ @@ -975,12 +993,12 @@ "BtnText": "知道了" } ], - "ID": "000929de-55cd-4381-9582-6326a13ee27e" + "ID": "a7053b69-0704-4bf8-a2a7-ebfb2afa3776" } ] } ], - "ID": "e32b8d41-1911-47f1-817d-4a5ca67ad21f" + "ID": "d3df30bb-ec9d-46d2-98b6-8c913cac3e4b" } ] } @@ -1109,7 +1127,7 @@ } } ], - "ID": "cdc3c85d-44c0-4edd-a3fc-b04d2a6f400c" + "ID": "d522537a-1f49-45e1-b82d-c256aa9d0b1d" } ] }, @@ -1150,7 +1168,7 @@ } } ], - "ID": "ae1b388b-63b1-4cf1-ad7f-803916f5f2f1" + "ID": "c298937b-d992-45d7-94e2-28736f1c0dab" } ] } @@ -1265,7 +1283,7 @@ "Disabled": true } ], - "ID": "f1d9d041-d47f-4187-be34-fe22aca2097d" + "ID": "6ff10cdf-d0c1-4f3c-a71c-233bc1324245" } ] } @@ -1443,7 +1461,7 @@ ] } ], - "ID": "55077d25-6c14-404a-889a-639dc91f7ffd" + "ID": "4701bbb3-2049-4a7c-bb03-96703f9b7841" }, { "CommandList": [ @@ -1460,7 +1478,7 @@ ] } ], - "ID": "e3e5a401-b1a5-4c70-8867-62a3af8f4f27" + "ID": "1dcef547-f973-4116-90e6-6e4f2aab8c38" } ] }, @@ -2186,7 +2204,7 @@ } } ], - "ID": "2fca294b-427b-472c-8713-a308010a5d4a" + "ID": "e75f43f6-9fe8-4568-9bc7-0e1648256729" } ] }, @@ -2296,4 +2314,4 @@ "Formula": "任务首页!$Y$8" } ] -}//oxw78mn/CcqqH92fL+PsNsSZgcYfsyiTR9Xm6bRVn2Z25Ww8x9roDz1UW4SNAk6ePtA4WIqfq4n1taegxNch14c8g5j05LKWpzBnI9/o14cLgf67MuDkASMxp/fJ6Cvemue+EpgybB8HMW05rz1VslYxo4/ZT/4cZY3pgTl9Tkv3evZydqxRZtjv8CBj2ACPoZ6GNexNdkqE+wZxXiQbjSl5AW67CFeIJ8BpCJL/hb9OQSFWyhMxELo5ESyP8pA7EcdLavKLN2UJAqBZVhtRTsjZ0zUAJc/ZvkMVyhlCPoLjzXm5vxS85u6+n8lqFLBZ4QzTcvfAu4iQdNrwA3T7Sxlq+yuhsVeeeJHx+O3xg9mLxu5y4FNz3SaN5/LfxjK2izxr5427+DyiZ5qOFALrTTRWCJVD2UGxSY7cPuf6x7fAjYyQyCpS7bJVL9smExb1/UIAZaZEmvmlv3tKhqxEETAT+lqamOejudiGqkca3AT9JDQ5ia4g7fLc55i/TFNVUWEh3h/jOcFuKM/+n78/6Kd4rth0UVsjD8mY8uqD0sdtGA3tSdJiLCo0UYy6kIN6HdZC/p7BYpC7Am0bzhOmX7SX/ldU0PsYsxNFtHnqnSxsHVNPKUk/w5uwWFm8KmLf3M0SnIdwZa4+RL0jl9LdAGipqQxBCPMbl9AzPS7puH723+y3GJOQraaObZi2bJzauLZSGfLd3YcdMd1BAvap/sur/zm6+W/AFjH/ReQQT//IjSYvajGkVl7FnkqAoRsSV3mhUqjb/GuU6nRXzK8CJYvkRPtSUWrAU2LXpePgPec+g4uBi84jG5quxkDN/zkbTrVuiKsSi/8FRDTYDAQrdjqFaQwePFNXWHkshJtcmQGrNYiyAEN6G9s1+SfkETOkvwRsWyU98UTkF6QFY5fpOw==|920 \ No newline at end of file +}//qmt5F/SczMDGg/3xqp1+M+jGN7oJ8szXVJ34s2z2cv2HOE1VKZxM4knv5lLCUSEaKeUJhgno9OWB/iH8bCNRwi24gbtXKWV6Ujt8PhRDxU1g5rfDrvSjWOo1hKwkrigzJffPWGJyYujOzckH6PO9xjF5c5eN8ntuhICBdz8VdjSE9PQMAuuESQoxhoIjl54beUQKfHqoLySP/aCjPupy6wJ08D+JUjzGab9MIMtmYj3mqyVVt5zGZV8nAaWdLgoThvFi22kH3OJadTJl5aVAR5O/j/XbVs8vbutTe4gz+a3v/1/aQFv9iJP86y/5rrvUjdQjGAHJLzNkJ7XSHk5P1sUdN2c5tcOA3UlJpttHzCgJlXUfzPMqHqco2+xFxm+lps2y+DMn9R93VsegpE6/kg6UhLw1OWIY81tk50zcz3dOu4YD0E5+KgDhAJefvReT3Wjzj4lN3WXYPODQfsMKLLYD4/CXF/Pz9boS00qORzkkc3kBVw/xhjBZDVOXKEYTUqPjL9fwe0wBm1istRIv8yhwND4Cjhvs7BZGneRN7SMkBfNlc8PgimfD3ykE05HQTyiq7Q7QYpQkT6CR5aMDEYIxWY1rmNLxnVkYSY2zaKlC5ro4QgxOv1jjFD8+ToOWpoIENPjYFua59MuBxy+xxpROE8R825ObKIGHMMfLv2mHyosXK5TqNf4yjUW643SZqzWYktsPJLoP9b3bmelFX9XBr+uhkFP030HRDoqHDx0SrSMYTWxdMGSyWNMOztYQRWUjHA4qr73pX0EIC9Y5x9GSzUZljABZu6oy3vNTgAWkbvWvczv1QKPOkIm71lnGluuhaR8B5zjv1R1fWyLgsHkPUUEZu5UZMCUA+BB2ENCeo5NuCnL/IrErvSxXmN3iCLPbeQl9FZ5UOfMGY52VuA==|920 \ No newline at end of file