From 73bd7559f602da10eef32b64a0874ba40ced61f4 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Fri, 20 Sep 2024 14:35:08 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E6=9B=B4=E6=96=B0=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E9=A2=98"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E9=A1=B9=E7=9B=AE=E8=8F=9C=E5=8D=95"}],"Version":?= =?UTF-8?q?"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 50 +- Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json | 16 +- Pages/共用/项目菜单.json | 9 +- Pages/项目/项目首页/项目标题.json | 202 +++++- .../项目首页/项目首页-容器页面/任务列表.json | 680 +++++++++++------- .../项目首页/项目首页-容器页面/任务列表.rd | 2 +- Pages/项目/项目首页/项目首页.json | 40 +- 7 files changed, 654 insertions(+), 345 deletions(-) diff --git a/.collaboration b/.collaboration index 09f88134..8c6598ac 100644 --- a/.collaboration +++ b/.collaboration @@ -594,19 +594,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-20T14:29:41.5875138+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷子页面", @@ -718,31 +706,11 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-20T14:10:26.899478+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目首页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-20T14:15:43.356473+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页.json", - "Pages\\项目\\项目首页\\项目首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目流程页面", @@ -978,17 +946,7 @@ }, { "ModuleName": "PCPage/项目菜单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-20T14:09:52.1009114+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\项目菜单.json", - "Pages\\共用\\项目菜单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/切换项目", diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index 507625d6..590c1b63 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -154,7 +154,7 @@ ] } ], - "ID": "5ad1ac19-63ea-4cb7-82fd-9cf6c29f7cc4" + "ID": "38a139a8-ee24-4ace-82c8-dec9547e45be" } ] } @@ -228,7 +228,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "43e3af32-0e2b-4f59-87cb-cd74b517c264" + "ID": "c2b61cdc-3bb4-43c5-8031-f45936aecd26" }, { "Condition": { @@ -258,7 +258,7 @@ "Message": "复制成功" } ], - "ID": "dfbb6b22-d192-4c9d-8634-9b3a84d20650" + "ID": "3e46cff1-6104-41d7-80d1-239d21d81c2d" }, { "Condition": { @@ -335,7 +335,7 @@ "Message": "操作成功" } ], - "ID": "b0460bf1-194a-4ee4-b3c0-e3db51c449bb" + "ID": "6f2e4e7f-c5bc-4a1f-b7ce-9783c5341a44" }, { "CommandList": [ @@ -350,17 +350,17 @@ "BtnText": "知道了" } ], - "ID": "77deaea4-5829-4f6f-b07f-ed682b5d68e6" + "ID": "28aa8022-677c-4bfd-88ea-db0e8dea8082" } ] } ], - "ID": "48252a27-4123-4cad-8a55-677dcf0476ff" + "ID": "41a0c680-2bbd-452d-aab4-4625336d79b5" } ] } ], - "ID": "c8cdb255-5a89-4fcc-85ca-d0c057f7d833" + "ID": "90b78e99-dd43-4012-a58e-3bbf65041c19" } ] } @@ -455,4 +455,4 @@ "Size": "24,24" } ] -}//yIL+Cyxs8RdfIOy3a5jhLFWIAe8U+dqlAPoXeT1QzZLRJkSVVutjTHMdDm0Q+4ReViEHoCYrDO6cSByG0o4c/SO1Fd5gPMRR5kOcu/2/MgWB72hCAZtpRiO+w8zSwCQ/P1IZLTOgpYXrpeLWK6FLXc7MasW8edAAD2YgEVAI/A2xNqCL7rrNw7a1opOHTIRERXcm5y7nPqkIPs3nZPeetB+TvM1U1Sn29RtWQJ/EMBGoUpULthXBZuBAolElcSApK8NZ8wLtk4dhjIO95tf02GeMBIlTimZWrVAclkImghLu5SgPBNaecM1/9AKBEewDkWL+wJbaO5rKxAQZjKP01pjBZlGbyraNDdyzCAVQ1qN6krndKxjvRupCo79d66WObLabvPJ+S+v9yTboykNCYxZ0uJs9SWINIiQ25Pkq991+TOF27TdJTlyUxf8VhxHzPC33saayPGtKi3fqgYtmb3qoSwnMPpkPEJApikKyjEqGz3NA/OZZu5z6E6GuTXqlGD5XprfWYASvLscMl+GHPGiS347agIxV3orrL4X9p4cYC4ko9ZS6HRlX3wADArmrFS5W2mW25e9KutLv69MkIK1uIoTR5VlJ/gp/68Oy3UIWvaK5OMNcbk70H+ZYDmkMvhrOsy8bt8fCTTQG+PBRLrARRYXAdb8F87HkY8ILI3+muM/6tPmX55LKh5FitDrNkg791k4slfXIHoCTS0myczagdwDzHOU6xT3BSC6BUXhKRpiMVDB/33RiLHVbE6Ih5coYIZh+2/PV0HU5QKwYH7m9U84eFAE6AV+K1Cs4Q+Kb6UjoukA8Nu2xfzYiTbh97UzMZwCVBLzF3hg4ZoLTWzmLaPA61H0A23Xnn/qiEa97ckmNufEAKeJGz1uEdo+FPVl8bPoRvlE1+X18C4VaXw==|920 \ No newline at end of file +}//Jl6QMTJ0K0RIzGtth3T2Df653YG2/kB4ZesQKkjesq8DWeDjuMlHoV0n0ou3bQ2VWDD0RTSVn4XbO4XsMDEzX9QdGQj82aC0+7yb/flg0DZNtzKNb7PGEfmQ7EEwuWcPLATLNbYYdI9+f4bncKQEtA4fPSrrveWhAyvAda2Nk1uTrZXNc8Dx+BivKL1zk9LHojzVOsG7CF7vOO8yRw+jj2IHVoMPguadmO9Po9pxUz3QBsSiSLb2H6pEHKpHnx+TQmUjcSTaVliI+AQA0ixI1RRKffzOFGDkS1Mfd8CXTe8ADCl0jdF8AgTp1wEq8GDN40nmFkdU//IktBjIT3uSC7Kcj9BKqoWjAlPidZz2yMfw9MM1dLTC6FcOuB4jTnTVBpTYjJi5AUBn1JokOEFFB0H0dJBIGxGCPWF05i9p64+d2KdFavOmrHaNSBrl4dyXw04Y1XmJd9SKNFKI8fyS6V8OcMYgmHjVCy3rWE80iLlgRK/6Qwzqe+SsH17PqTP0WvkdJdgzWeJQjlPzJA76boGACy7yJc+Xp0YT/Z0JORhMHEs/36MoJyzv+quUpuo/y9OhcuqXbzUIDFzaXekEMOuPHKBsy+rwdQYk7QL49dqtN+A7ARazN46+TxeJbDHL8TmRGcrCtpwR0GsnQcV3Tf65777aZ+q3v+SXLGj53iqLzcW25jGfCsT6Wji39xIBh6S+em/eeqFFbYyOPLMxvoVEm58eMvyQ8i6BFqMU5IdYpk+NTFgrFjXnRX2Yjd4c676jxkJnjPSEHQS8Z2yG75rcFGvqG5eVUyI2x8abNfmEzmA7GEeqoCrlay0DTW3ZUKXYAvU/rgfNNSvVgEx1eIaUrW6/dAzIAEV6wEyaYnkvigS5FeJTLq9R/qq+m/6qLWmxC4B8SVFElnB9sPuaAA==|920 \ No newline at end of file diff --git a/Pages/共用/项目菜单.json b/Pages/共用/项目菜单.json index 9c1beed6..e2e2132a 100644 --- a/Pages/共用/项目菜单.json +++ b/Pages/共用/项目菜单.json @@ -87,7 +87,7 @@ "3,1": "预算申请", "4,1": "邀请反馈", "5,1": "发布更新", - "6,1": "归档项目", + "6,1": "提交立项", "7,1": "事件通知", "8,1": "退出项目", "9,1": "移到回收站", @@ -246,10 +246,11 @@ ] } ], - "Text": "归档项目", + "Text": "提交立项", "TemplateKey": "链接样式", "Icon": { - "Name": "项目文件.svg", + "Name": "Application/156_processCentre_1.svg", + "BuiltIn": true, "Color": "Accent 1", "UseCellTypeForeColor": true }, @@ -453,4 +454,4 @@ "Formula": "项目菜单!$B$3" } ] -}//wNk/hL/OENiquijMbHkkTvtfBxnJ3tghpmL59mQCiRZWxSRYB7cPQPj7zhLWzp21zaBgJWtZ6ejj+LRZrneoF/a3qhLqWvkJtI5JeUjOwEtf16+mKNWpv8xwCKpfXW6Dj00Yob3D+Z7eDsU6p/xuY9FkYk/rFJUnZsKG8g4EfK+qcU9YknsiA6NhxO1hIFsa9qm6F+eTceH71ntqFqngqWKp9Y2+tIOjELq8eWe9llw+NBj5114XdPFwsZYXRTGyyUbLhSIe3fjP1AkvC5XNWFskB/DjPfQlrRvOU1mZPxr4Ld3gOHvvLlnram6veAoubWxvP0HrG1RCfHuC3h5+V1ZMjRdtuT7tMw0HrmnwIimctnkcod5iT+go7J4foxMkTQiYZtMOr8ALlw17rFTJPrgGThn/u4iLJO2pQxC5OaHorcGQOOO4KqzBUskpEGPqJktFEdNAQxhbe/1fC7Gc4uANQXNnggZScr81AiJJfDK1O1aD38Y3Yd1ujh+xAo5tHUfvfnqqbwNc8R9j02S5EP+jrpKhFZ71JXf2q+bH7iMsH8VXFjGsFfwvFPTMArzbFEYD4PKpU8bOH3WS1C9uzYwPrlY6vbp/feKSPVMFOTm4R8Uow0iB2Q5oBI66PqjvRIffS/bmV8ICnRkB8qHFLo74cbyXxA8w7RtXsxzFjdB+0wTRsKm0KihHR/DVeDD7Jv5wqE6+cSZB05F1mjmVjmgyj+z2pCvdwCW9x+s9RUehXFCU/a6YB5RR3wOo9oMRf8zpfLsnhILUbsvNHR4Aj365eneykFOxu/RUGOotq6fwkvaKnEpWsAEd2lrVeKz1ckKxGS4054X848OVMeQqmlxIkQBqyyzPkaOlvJ75q0I15vp3i9utbZsdWS6PpgDBFlsJ96M0/NqicKgA5qBxVA==|920 \ No newline at end of file +}//WfcsMMtHu2HihPSL0yRBgYhZDZDIRM5avfsD7SzEbalvu+Qhtuob6moTvvSRI9+L7zWEpyIbUhYsuzAwJ1iPTNHIgiAs8TZci9WPLu4W4WiExqEnqvla93xBhhzmbimbAlLMwjeZCzg2QeTgv4JgPz8t5+nA+VOoI9xhAew9mYMfUtAZZ8TfN1WPK6yFg2rqmrSGMEodVPuyXD8V1vypGoonuuZurGIfGfOTnRSSgE5vlKqX0OQx/J00YY3kLBepfeoUjQxIbmd36DzqY+hYPwQ60S1L8Dki5QiYTjPVRYUZO1g8NFwoVoONQqpMprwzoZOY6uYembMe6h7MpcapNhUHjcGNpkjvywtY0BdaEdo/eVxFWVtmGnodJF3dH6+wGT9mou62fh6iVezxtvgc1fPiRCy4bxIa2xOD4x+QhFamQwV7eWb/dONyx19lKlOP4XrAmXfMZdOl6wF165VmjGwDYpPw9N3Baw8MtPG0IEVHB1v3iThrz3ikGfIyosyAvyC9PxI43uYf9BFH0KCIx9YaGD4RDY22pQFIwEwjN7GTICkMSe4YJXTNTZKEchvHpTZTtldj57sLeWStunhaF7WVlSbcNZIzQobRre10MSKd4t604Y4Bfu+9ktCUInTiRLxCPRp9k+HEUXVR24v/SaPzsx6VpLOQhA5szxBR6d+QhKvm6iyM4xvDHZpHkfw/etXX18W/cZHwWoHzcDL5E84URdgmAYTkrXqXJaQdpk12ELCycl0694zPmsCwuLUJGQYSWoH4oyjv7SNHWUgZ6PaukkjWXJNrjIaDs72NqsX1c002mul+mo84F0SBf9fNpKIZpIaj5/nlZch/of+f86kJLtWffDvhw6cik6qIgKzP7z3pgwXCNnosAI5E6v+RsYFvGsxhToU6WAis23VFkQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index de9d86ab..4717baf7 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -256,7 +256,7 @@ ] } ], - "ID": "4ee6df94-3f79-441f-898e-7e08010cc473" + "ID": "eecf5243-b9d1-42de-bb20-7b5fe2bf14ad" } ] } @@ -478,7 +478,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "fcedb3f1-f25e-41a5-ab60-1ab6e1912f49" + "ID": "d209319a-204c-43db-aa39-944eea0480e0" }, { "Condition": { @@ -500,7 +500,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "e078ceab-710b-41e5-8e92-9c3b78c9ef35" + "ID": "5acc66cc-72e3-49a8-9060-5aec8ddf1c51" }, { "Condition": { @@ -547,7 +547,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "e5cb81d8-a22c-4116-90ac-373af4b03843" + "ID": "4144cec5-633f-4d33-8448-b19edb06b782" }, { "CommandList": [ @@ -557,12 +557,12 @@ "Message": "只允许项目经理进行申请" } ], - "ID": "50e7fae6-ec85-4ea7-9202-21dea9aeb9a3" + "ID": "610e2b63-01c6-49e7-8839-c448d32f31b0" } ] } ], - "ID": "a4745de6-a636-4f83-86a8-90bc709a2906" + "ID": "75429222-d0fd-4d9f-9964-c090d2394601" }, { "Condition": { @@ -627,12 +627,12 @@ "Message": "操作完成" } ], - "ID": "3fcd0407-168d-4222-88fd-efe7830108da" + "ID": "13d15646-f8a7-4a75-9c4e-ce7b181be44f" } ] } ], - "ID": "d8dc126f-7c7b-461f-9788-b400eedf16c9" + "ID": "cbbb53d1-1ce5-45c0-8a2f-84351edae2fd" }, { "Condition": { @@ -728,12 +728,12 @@ "IsOpenInNewTab": true } ], - "ID": "fbb11270-4656-477b-bfeb-77db089acf2b" + "ID": "0990658e-43f6-47f1-9804-d6a52fb1de03" } ] } ], - "ID": "e1568df7-3695-4ee2-9ede-af30d81ce014" + "ID": "5929c9cc-1442-4922-9000-1e8f32698a42" }, { "CommandList": [ @@ -743,12 +743,12 @@ "Message": "当前项目未开启收集需求功能，请开启后分享！" } ], - "ID": "fa643067-6fad-4b37-b9ca-ecaaf15d2a4b" + "ID": "96571233-f481-4875-bcae-576208372b52" } ] } ], - "ID": "7ae1e8b8-c7a0-4b46-8a56-98f16309b4a8" + "ID": "0c7216bf-7b6c-4c19-bf55-d6f194fd7bd2" }, { "Condition": { @@ -781,7 +781,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "0987139c-533b-4743-b2be-4d67f2ea8d9d" + "ID": "69de9cf5-23d4-45da-aaa9-c45590b3893b" }, { "Condition": { @@ -803,7 +803,7 @@ "Message": "暂未开放该功能" } ], - "ID": "c7d06983-9f99-4db4-9df0-fee304f18c55" + "ID": "59b061ce-ad8c-451e-ae64-e4da9531fb78" }, { "Condition": { @@ -838,12 +838,178 @@ "LoadBindingDataOption": 2 } ], - "ID": "ce12bbd4-0e1a-4f41-a2d0-d8c4f1017d5e" + "ID": "f2c4e428-3892-4274-a788-79e09c777dba" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选择项" + } + ] + }, + "value": "提交立项" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目状态", + "GUID": "854059f4-3388-4dc7-91ae-5723f491b130" + } + }, + "value": "0" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目状态", + "GUID": "91d40cc7-5aaa-4b7f-9932-9bd80293257d" + } + }, + "value": "4" + } + ], + "RelationType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "项目流程发起前校验", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", + "ProcessDefinitionResourceName": "项目立项流程", + "ProcessInstanceName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!项目名称" + }, + "SelectedTable": "项目表", + "ReturnResultName": "发起流程结果" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=发起流程结果.ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!刷新项目" + }, + "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.5.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "ExecuteCommand" + } + ], + "ID": "8e12597c-5b04-4e5c-8d14-2227a248bf44" + } + ] + } + ], + "ID": "f66a0f2f-cc80-48de-8329-96d8ac680fc4" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!msg" + } + } + ], + "ID": "34820749-339b-46ef-95ff-373415a16454" + } + ] + } + ], + "ID": "8691afe2-9491-4f0c-893b-9c5a89242bbc" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": "项目进行中无法重复提交" + } + ], + "ID": "94bdbc44-b241-47b4-9bf9-38d9dae1481c" + } + ] + } + ], + "ID": "bff1af30-7ca3-49d3-9262-cebf82d0653b" } ] } ], - "ID": "111b9b06-d564-431f-a13c-4e49af1e606a" + "ID": "948a2291-dbf8-4da5-b10f-75540d08d162" } ] } @@ -917,7 +1083,7 @@ ] } ], - "ID": "bb6e0da1-1951-46f3-881a-91f0c244fd3b" + "ID": "31bceb16-ce85-4869-a74e-f5cfda6bda0f" } ] } @@ -1153,4 +1319,4 @@ "Formula": "项目标题!$F$2" } ] -}//fVr2DZCQljr29r4lSc3KPcmv8asGB24iHEcg+AzGoCWiJFECXUmFKv3XIVALR1B+R5JYgsKFJHotQenrrUExDkyu4uHW5lY5gpw1VnbkuufMZ3/otlWZVYajA0BhDj+BTk9uKUg58pGWHop7LM8mDfMXTcb2FYOKs4JEl7Oq3B4vkS07EmUqUDQaK1El1qBxc0XtQ7Q2nrF5Ficf4TK+Rk+iGDVPsZzwwR47CWjWaf37I//j2vmWlzx1o+apg56IEBpCLVINGEOLi6ZaF/8kSlqdcXXfDOwoOXWzcag0SqWj5sW6qWMDiluaMARbwakrgmp4XOKrYqVKHxvO56hMbx1S4So2Jx4GSYTey7yV0oMR3/j1SFslGB36SFRKPkIbWh8ekDq+JKdZeMcuflbucbmqmpgelunjtOidYzXBVfK3R7iJTz1gB57OZm6aeu+Kj7+AE72SWdSpQx2ALhemosOzQZAR9/cnFIhMuvN2OEu0FVSvsXmn/5G3rSyOd1/z982fkZVP6nxQ8MdkRAJyWV7RXNYk/UE4g+W/+UxbVIMvB05dbpgdeRPA9RJdrgBAGVMj/O6iymF6tCjVSCyo/0ICarPmemeuNeLlcZibkgh0Uok6vejGuK0WNv+DeWAA+M/MpIMZTSmjZORvcJlMIi3ay24Iwe1/Eqzeli9qhy3sPyvr8QBA9nD+YDpjvMHvhM7oxRiPSp4EYa6Ejfs8lKEWogzHPDxqXMu1L7cu5JK0fLmmi2Vf+dU35VjouY15UZHPRijqSA5CLrcYzas9Gh1MaZJ2iH7JNzDs4Cdk08G0do3CHPNOL6FWFt1ppwN4q1QEKjlf1w1MbkYR/SPqrGMRdJHhRfo4N74ArHqi6P5n6M1orUBG8o/Z4NqQunwCiSvA6z6qoGicUEIq720jCw==|920 \ No newline at end of file +}//feZPelDDzFKJKcyBsbiYDTRC8Gh49Zur6jZSJrfQ1h6u607hFfWqvy+MSwvsIiHtVFK1u9t5GPjyNQEfEm3tCslmPqifUIQ7M7LwUcteZyl48hvKm3VPmdGLZAjOeemoxa7eGZRgcWxOY2Mr7loojnjP1Z3GlJwQEixjaSqQ+i67J4x543thSKPQTzr0a5iPfcVwWPb2u5BLNtaCBrpj4Oadej2+CiAMUR7PfO+9K7TXFnax8xK+9BLqAo6Z5r1BA2KrN0c7v33tKDctxhjtiD+IxjxgqYyn4Irdn5vrCoXWjMXVEU4k9F2wiWaHe3DVIi8a4QEQh66W7XqGXL/T6A6l2DrXamwM3bGMqQvZ/b5x9pZ3lfA1C5YrCf7FuIdprivFm1Mfagz7aJZzE+JNvXj1ZV1XOH3aNO3DCJx7yLcIuqHiBhh8ZKp5PKg7WiybHhPDcGjiqXa8HxJ0ZR3pVJ3rzqETRy6dSC3uosIUdMbgRkoVhWScO1E3kI3lF1ulvhAJ3/6Hj4leqO4deOFPKuYrj7P+BWr7IvbFpAcR4lWXw8Ujg7dOmAE+JiqGFmYOjY9OjA2msK9Dj0/EtOvuXGzW3S4+rnIVwr3i33dDYGMi4Q3u4P/Pmp6oGkd04uLY5XkXQYuG2F4vMi97WqOcP/DzgSMDQa83AhjyrQtPsNM7BFhuS3gDad/OFTAzglE46JT7ZHn4hJQwGk6Zd1nvp1FIWzE/DwrQM9g6qGpA7m0yG/9codwnLJWlP9m/VvhbygARja+dcTreTJpyBmQp/EhLpjwtapTG0dHikltpvqx9QZTbtww1usQ0lmZ/a/avnExwmI2LEwumzbRZt5Qjb6OkA/8ZzVVxdohN+E65c3AsLBgFrePXLm3Nj53QrHUmZTLmV72vkathmb2jj5TW0A==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index fd7ea517..40eda3c6 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -156,57 +156,42 @@ }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 1 } }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 1 } }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 1 } }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 1 } }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 1 } }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "23": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "24": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "25": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 16.0 } }, "27": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 16.0 } }, "28": { @@ -236,19 +221,12 @@ }, "33": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 16.0 } }, "34": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "35": { @@ -272,20 +250,81 @@ } }, "39": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "40": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "41": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "42": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "43": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "44": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } } }, - "Count": 40, + "Count": 45, "DefaultSize": 32.0 }, "Values": { "1,1": "任务分组", - "1,36": "新增任务", - "8,1": "添加分组" + "1,41": "新增任务" }, "AttachInfos": { + "1,5": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目任务分组详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=项目任务分组详情!项目ID" + } + } + ], + "LoadBindingDataOption": 2 + } + ], + "ToolTip": "清除筛选", + "Size": 14, + "IsInvisible": true, + "ImagePath": "增加.svg" + }, + "RulesGuidList": [ + "a7eec71c-1ccb-41c6-8003-91b1eee8266c" + ] + }, "1,6": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", @@ -337,6 +376,93 @@ } }, "1,23": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目版本", + "BindingInfos": [ + { + "GUID": "435cda5a-eff1-45c1-8411-70d5ef879812", + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "ID", + "GUID": "fd301f2b-5ae5-45ee-b9f8-e1abb1b66ba7" + }, + "ColumnName": "value" + }, + { + "GUID": "6137349f-88f9-4e2d-ad62-fe0be8e3abe4", + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "版本名称", + "GUID": "65adbe0a-b1e1-4fad-8f74-a51ceedac35c" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目版本", + "ColumnName": "项目ID", + "GUID": "54768377-dc1b-4e9a-a487-d5694e958030" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!项目ID" + } + }, + "CustomColumns": [] + }, + "placeholder": "选择版本", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "1,28": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -418,7 +544,7 @@ }, "CustomColumns": [] }, - "placeholder": "按负责人筛选", + "placeholder": "选择负责人", "noDataText": "无数据", "filterInServerOptions": { "matchMethod": "contains", @@ -427,7 +553,7 @@ "noMatchText": "无匹配数据" } }, - "1,29": { + "1,34": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], @@ -452,7 +578,7 @@ } ], "type": "text", - "placeholder": "请输入关键字搜索", + "placeholder": "任务名称/任务说明/功能名称", "suffixIcon": { "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", "Name": "Application/047_search_8.svg", @@ -462,7 +588,7 @@ "resize": "none" } }, - "1,36": { + "1,41": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -660,7 +786,7 @@ } } ], - "ID": "38653161-b8f5-4da3-beef-c13f7423bfbf" + "ID": "e89a3540-ebbb-494a-9967-2ce56a466e41" }, { "CommandList": [ @@ -672,12 +798,12 @@ } } ], - "ID": "da023572-be11-4b2a-a4fc-b71c9a801c85" + "ID": "0721132c-fa55-40ee-a26b-b41827754814" } ] } ], - "ID": "04d63b99-c31d-49ab-8ca5-1c3ccd527419" + "ID": "6d8b2d26-905a-43ed-8865-63290db7eaf7" } ] }, @@ -742,7 +868,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "b48e51c7-9131-4f31-8d00-ebee80a756f5" + "ID": "3836e8b6-5ac3-45ee-a834-298ba2c32fe4" }, { "CommandList": [ @@ -757,12 +883,12 @@ "BtnText": "知道了" } ], - "ID": "ea8f96a3-574e-4f19-96d8-bcc1bb3e6107" + "ID": "e3b00b24-1640-456a-ad81-90df2e1dc8cc" } ] } ], - "ID": "93eb144e-3fa2-4329-a9d8-bb469257e296" + "ID": "fb8aa321-cd29-42e6-8270-b723f6be9033" }, { "CommandList": [ @@ -784,12 +910,12 @@ ] } ], - "ID": "d15af25f-dbfd-4629-a895-4581ebe0b2be" + "ID": "75b1b9dd-b838-473c-8375-811682afee1a" } ] } ], - "ID": "5cec0774-d2c6-478d-a3c2-cc1d59044f02" + "ID": "4d7d4f47-8788-4d65-86d3-92b06eedf2ff" }, { "CommandList": [ @@ -804,12 +930,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "43fe857a-b197-4b42-8432-45a090518da3" + "ID": "c553e05c-2b66-4078-9150-50f0fcc4d669" } ] } ], - "ID": "7db733f8-0bde-4035-a6c5-f7878c3e23e4" + "ID": "14580d87-e979-430a-8bde-2472cc7a1c26" }, { "CommandList": [ @@ -819,7 +945,7 @@ "Message": "只有该项目管理员可新增任务" } ], - "ID": "a99c749e-093b-4b3d-8173-d8aa0dac84f9" + "ID": "3ab0d502-639d-4265-b764-853b7f29393c" } ] } @@ -1001,7 +1127,7 @@ "TableName": "任务平行视图", "BindingInfos": [ { - "GUID": "519c6a0e-9160-4ced-b0e8-0211bbeb059c", + "GUID": "f1c26c28-3b02-45f5-a03f-fc51e71b32f6", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "ID", @@ -1010,7 +1136,7 @@ "ColumnName": "value" }, { - "GUID": "e5599659-fdde-44fd-857a-428e5f9abe37", + "GUID": "dc8a1e1d-abcb-41d0-8405-a32afe46387f", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -1019,7 +1145,7 @@ "ColumnName": "parentValue" }, { - "GUID": "4769e44b-878c-41d3-b86e-807fd5933225", + "GUID": "052d1246-0e3b-42bb-9a22-c26eac29cb56", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -1033,7 +1159,7 @@ "ColumnName": "状态" }, { - "GUID": "f7a07a33-9240-42fd-81cd-02c17449fab0", + "GUID": "15cd4a28-3825-4e89-83a5-3f6ebe58b94b", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -1042,7 +1168,21 @@ "ColumnName": "任务名称" }, { - "GUID": "7e940598-e013-4a4c-94d1-2e95f9526d9a", + "GUID": "acb5fcdb-5456-4a3c-a7cb-c887c669e871", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "版本", + "GUID": "b8678bd0-d2cb-47da-b6c0-9605b417eabb", + "RelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "版本名称" + } + }, + "ColumnName": "版本名称" + }, + { + "GUID": "0bb7bed9-4751-434a-9aeb-743f50576a44", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -1055,7 +1195,7 @@ "ColumnName": "执行者" }, { - "GUID": "7beb3713-2cf4-4b8b-a8bb-6ffa9e9aedb0", + "GUID": "3fbdb2f4-866b-43ac-895a-8c6d41483f51", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "开始时间", @@ -1064,7 +1204,7 @@ "ColumnName": "开始时间" }, { - "GUID": "1b2c438b-01e5-467c-ae2f-947707625348", + "GUID": "5a814752-5c08-4d19-9154-f61b48a97239", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "结束时间", @@ -1073,7 +1213,7 @@ "ColumnName": "结束时间" }, { - "GUID": "70cea4bf-9aa1-4385-ae49-d5b653bfd5f3", + "GUID": "28e6566e-1f01-451e-9b73-2075ecb717ba", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务预算工时", @@ -1082,7 +1222,7 @@ "ColumnName": "总计划" }, { - "GUID": "e0123aa3-6c22-4c2e-9384-0366aa445fa4", + "GUID": "8af9f7d9-2452-4c1a-9a55-a01b31b2e24a", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "本任务可核定工时", @@ -1091,7 +1231,7 @@ "ColumnName": "可核定工时" }, { - "GUID": "dbeabb17-1e7c-4408-b98a-438a31e47881", + "GUID": "70f307bc-2546-48dd-ad1f-ed2f669fc3ca", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务成员", @@ -1136,20 +1276,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!X2" - } - }, - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 6, - "ColumnBindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "任务名称", - "GUID": "21ded7f8-684d-460a-98f9-0dd581da059f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!AD2" + "SerializeProperty": "=任务列表!AC2" } }, { @@ -1163,6 +1290,65 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务列表!当前分组" } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "版本", + "GUID": "420426e2-99b3-40b4-aba7-1e0b5259a50a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!X2" + } + }, + { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务名称", + "GUID": "21ded7f8-684d-460a-98f9-0dd581da059f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!AI2" + }, + "LeftBracket": 1 + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务说明", + "GUID": "daaa83b9-e364-4637-95ee-629ee7ea8d79" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!AI2" + } + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "功能名称", + "GUID": "52009c21-36ee-41f0-8b6d-4754cdd5d93c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!AI2" + }, + "RightBracket": 1 + } + ], + "RelationType": 1 } ] }, @@ -1187,6 +1373,7 @@ "CustomColumns": [ "状态", "任务名称", + "版本名称", "执行者", "开始时间", "结束时间", @@ -1214,6 +1401,14 @@ "Align": "center", "HeaderAlign": "center" }, + { + "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", + "DataColumnName": "版本名称", + "Label": "版本名称", + "Fixed": "none", + "Align": "center", + "HeaderAlign": "center" + }, { "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", "DataColumnName": "执行者", @@ -1426,7 +1621,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "45ee04a8-d64f-4716-8f9e-0a60170c616d" + "ID": "2e9e111f-239f-42a8-a057-5748f596bca3" }, { "CommandList": [ @@ -1436,12 +1631,12 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "9bdabfc9-bb62-4661-8536-21c0f8fec1f1" + "ID": "fa842429-b090-42a3-aa2e-52dbf4437ae4" } ] } ], - "ID": "6f7b1c19-7002-40b3-aebf-5dc669e9d732" + "ID": "84006662-6b3d-47f1-ab64-1d5f866c1abc" }, { "Condition": { @@ -1467,7 +1662,7 @@ } } ], - "ID": "4d307a0c-f3d9-4aef-99ac-3aa6a04b78ff" + "ID": "be5352c9-71ee-4684-b9e7-1331bac528bf" }, { "CommandList": [ @@ -1506,12 +1701,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "511dd2ef-ceb5-466b-8110-896eded82466" + "ID": "a6259710-bbf4-4c2b-87ce-701db6fd44a6" } ] } ], - "ID": "7647a2b8-b86f-4bd9-a66b-2016d94497b4" + "ID": "8f4e4d6b-56b0-45bd-a085-50b6586cf05a" } ] } @@ -1530,37 +1725,6 @@ } } }, - "8,1": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "项目任务分组详情", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!项目ID" - }, - "TargetCell": { - "SerializeProperty": "=项目任务分组详情!项目ID" - } - } - ], - "LoadBindingDataOption": 2 - } - ], - "Text": "添加分组", - "TemplateKey": "Gost", - "Icon": { - "Name": "增加.svg", - "Color": "Accent 1", - "UseCellTypeForeColor": true - }, - "IconSize": 14.0 - } - }, "12,13": { "CssName": "rotate-slow", "CellType": { @@ -1598,6 +1762,9 @@ "FontFamily": 1, "FontSize": 13.333333333333332 }, + { + "FontSize": 13.333333333333332 + }, { "FontFamily": 1 }, @@ -1634,139 +1801,151 @@ "CellStyles": { "0,7": 0, "1,1": 1, + "1,5": 2, "1,6": 2, "1,7": 0, "1,9": 3, - "1,23": 3, - "1,24": 4, - "1,25": 4, - "1,26": 4, - "1,27": 4, - "1,29": 3, - "1,30": 4, - "1,31": 4, - "1,32": 4, - "1,33": 4, - "1,34": 4, - "1,36": 3, - "1,37": 4, - "1,38": 4, + "1,23": 4, + "1,28": 3, + "1,29": 5, + "1,30": 5, + "1,31": 5, + "1,32": 5, + "1,34": 3, + "1,35": 5, + "1,36": 5, + "1,37": 5, + "1,38": 5, + "1,39": 5, + "1,41": 3, + "1,42": 5, + "1,43": 5, "2,7": 0, - "3,1": 5, + "3,1": 6, "3,7": 0, - "3,9": 4, - "3,38": 4, + "3,9": 5, + "3,43": 5, "4,7": 0, - "4,9": 4, - "4,38": 4, + "4,9": 5, + "4,43": 5, "5,7": 0, - "5,9": 4, - "5,10": 4, - "5,38": 4, - "6,1": 5, - "6,2": 5, - "6,3": 5, - "6,4": 5, - "6,5": 5, - "6,6": 5, + "5,9": 5, + "5,10": 5, + "5,43": 5, + "6,1": 6, + "6,2": 6, + "6,3": 6, + "6,4": 6, + "6,5": 6, + "6,6": 6, "6,7": 0, - "6,38": 4, - "7,1": 5, - "7,2": 5, - "7,3": 5, - "7,4": 5, - "7,5": 5, - "7,6": 5, + "6,43": 5, + "7,1": 6, + "7,2": 6, + "7,3": 6, + "7,4": 6, + "7,5": 6, + "7,6": 6, "7,7": 0, - "7,38": 4, - "8,1": 6, + "7,43": 5, + "8,1": 7, "8,7": 0, - "8,38": 4, - "9,1": 7, - "9,2": 7, - "9,3": 7, - "9,4": 7, - "9,5": 7, - "9,6": 7, + "8,43": 5, + "9,1": 8, + "9,2": 8, + "9,3": 8, + "9,4": 8, + "9,5": 8, + "9,6": 8, "9,7": 0, - "9,38": 4, - "10,1": 5, - "10,2": 5, - "10,3": 5, - "10,4": 5, - "10,5": 5, - "10,6": 5, + "9,43": 5, + "10,1": 6, + "10,2": 6, + "10,3": 6, + "10,4": 6, + "10,5": 6, + "10,6": 6, "10,7": 0, - "10,9": 4, - "10,10": 4, - "10,11": 4, - "10,12": 4, - "10,13": 4, - "10,14": 4, - "10,15": 4, - "10,16": 4, - "10,17": 4, - "10,18": 4, - "10,19": 4, - "10,20": 4, - "10,21": 4, - "10,22": 4, - "10,23": 4, - "10,24": 4, - "10,25": 4, - "10,26": 4, - "10,27": 4, - "10,28": 4, - "10,29": 4, - "10,30": 4, - "10,31": 4, - "10,32": 4, - "10,33": 4, - "10,34": 4, - "10,35": 4, - "10,36": 4, - "10,37": 4, - "10,38": 4, - "11,1": 5, - "11,2": 5, - "11,3": 5, - "11,4": 5, - "11,5": 5, - "11,6": 5, + "10,9": 5, + "10,10": 5, + "10,11": 5, + "10,12": 5, + "10,13": 5, + "10,14": 5, + "10,15": 5, + "10,16": 5, + "10,17": 5, + "10,18": 5, + "10,19": 5, + "10,20": 5, + "10,21": 5, + "10,22": 5, + "10,23": 5, + "10,24": 5, + "10,25": 5, + "10,26": 5, + "10,27": 5, + "10,28": 5, + "10,29": 5, + "10,30": 5, + "10,31": 5, + "10,32": 5, + "10,33": 5, + "10,34": 5, + "10,35": 5, + "10,36": 5, + "10,37": 5, + "10,38": 5, + "10,39": 5, + "10,40": 5, + "10,41": 5, + "10,42": 5, + "10,43": 5, + "11,1": 6, + "11,2": 6, + "11,3": 6, + "11,4": 6, + "11,5": 6, + "11,6": 6, "11,7": 0, - "11,9": 4, - "11,10": 4, - "11,11": 4, - "11,12": 4, - "11,13": 4, - "11,14": 4, - "11,15": 4, - "11,16": 4, - "11,17": 4, - "11,18": 4, - "11,19": 4, - "11,20": 4, - "11,21": 4, - "11,22": 4, - "11,23": 4, - "11,24": 4, - "11,25": 4, - "11,26": 4, - "11,27": 4, - "11,28": 4, - "11,29": 4, - "11,30": 4, - "11,31": 4, - "11,32": 4, - "11,33": 4, - "11,34": 4, - "11,35": 4, - "11,36": 4, - "11,37": 4, - "11,38": 4, + "11,9": 5, + "11,10": 5, + "11,11": 5, + "11,12": 5, + "11,13": 5, + "11,14": 5, + "11,15": 5, + "11,16": 5, + "11,17": 5, + "11,18": 5, + "11,19": 5, + "11,20": 5, + "11,21": 5, + "11,22": 5, + "11,23": 5, + "11,24": 5, + "11,25": 5, + "11,26": 5, + "11,27": 5, + "11,28": 5, + "11,29": 5, + "11,30": 5, + "11,31": 5, + "11,32": 5, + "11,33": 5, + "11,34": 5, + "11,35": 5, + "11,36": 5, + "11,37": 5, + "11,38": 5, + "11,39": 5, + "11,40": 5, + "11,41": 5, + "11,42": 5, + "11,43": 5, "12,7": 0, "12,13": 3, - "12,14": 4 + "12,14": 5 }, "SheetStyle": { "FontFamily": 1 @@ -1775,15 +1954,15 @@ "Spans": [ "3,1,4,6", "3,7,4,1", - "8,1,1,6", - "5,10,5,28", + "5,10,5,33", "12,1,1,5", "12,8,1,5", "12,13,1,2", - "1,36,1,3", - "1,29,1,6", - "1,23,1,5", - "1,9,1,13" + "1,41,1,3", + "1,34,1,6", + "1,28,1,5", + "1,9,1,13", + "1,23,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1856,6 +2035,21 @@ "IsDisabled": false, "IsInvisible": false, "IsReadOnly": false + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!当前分组<>\"\"" + }, + "GUID": "a7eec71c-1ccb-41c6-8003-91b1eee8266c", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false } ] } @@ -1875,7 +2069,7 @@ }, "IsAutomaticFill": false, "Location": "0,15", - "Size": "1213,378" + "Size": "1309,378" }, { "FitToBrowserHeight": true, @@ -1896,7 +2090,7 @@ }, "IsAutomaticFill": false, "Location": "246,70", - "Size": "943,271" + "Size": "1039,271" }, { "FitToBrowserWidth": true, @@ -1910,7 +2104,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Size": "1213,55" + "Size": "1309,55" } ], "CustomNames": [ @@ -1931,4 +2125,4 @@ "Formula": "任务列表!$I$13" } ] -}//MuDX+gTzFjlIkIaOLQ4VXVVRU6tXnvNR+KS8ju9Ez/duh9Po2bMY8pJBQBP8APjDnMcpNK60sl7UZIe9OJxYK9LSIckEKDvrXh4MsMdhN3cDnli4bVr2llF+b34grLudwAxx8K5AfFMQLRNUMJkbjxDJ8XtOmeWltEywkDYe6K1TDIooGVgpGvJ2JNgd/LOX4uTpfCzCFxynjUm98LV9/ZKI+8YCCxNYykd9ZCFkkLSAGsdbmhulm9onVdSRE5cPNMXWTQo3tJxjfBAMXu7oIPAKMyGJUb998QUoRNily6lxoMVIEpaGqXyvi+FBh1kyehCSfrJlIQYPxQNDQVzFW1ceiczhopO7nbesjoKSzs5Nf+Cz6Ymcgr10Q1efVHyKaGRPb8WZa5qXpvhj23bKX2BDZR4xECI1cBZ/f3JYLb1uOs7c+1Jt5HqGrG26zeUqPQUf9DeigDMRxAU05RbHOewZC5Dio7ueO9ZaM5XidUL3D/aJduLs4howRA3+k8F876LG7Wb+J55yaE+BDI+O0QMbYtcxa0oWelZRYmlTvwVpInpvY2wY5H2xe2D571ilTMb1+2vspKOZ67ftNxG5rC7dPXVmSzd3aj75B5zMxSj26BjIz5IOHNeCrpxEqn/a9G0xpEWLtpz/nPls9ZTr/ycqzdRHUOV3luhm9bugisAWORffPMCVMsx4ybt+N1Ap8OaSmkH036QMXypZ2AAs+dOY2ZgxU8X9ABfBQOfFKAmX61gFzHE5Qj5PJBT3HiV52xjVsLYcSZ2QZflPfDRnz0WpDAJldc3MpZbh+l76vtSbrOOSm+bb0iY1TMrysJIRPvccnLcEAvOT8ZsEk3KxU5dpVKVhbEApJ+7rm7pXqM5rFYQMSHTyuJXK/lmbTn2GZ0BkNC614VQbE1oCoM1jKA==|920 \ No newline at end of file +}//szbqpL1IcT/DDkgr0qJXIo96luG9uPP0smVClcmiQbFGtkBN324+5e4vBdqxN4eq0cYY5yTjX/2nVieKfDsYkUTCmCTzifqmx0Y0AZNecPlFCz729OvZ6qt8Fhi17BJ9bixU5nOpqtskx+Wy9Cr/3b2g7OqP1A0L6MWYzISSbClbRdjSfjc6sDl01zs/g7KsOWao1F/jiTAUE6Yn9n4PgYO9KhV2taCCak5M1UMat+MH6Hb+l1dEyaCQKt61ODiHtUUcLjbOeRA2VteaK2ylMsVAx20IXPN2ad+3ZnO/DaDmgR+UDfSrP9qQ09jh+QkKXM4rntrMajg6t2T34m95SbkxUSvBd6NibH3KDxzZaew2yEoPuXbEA4izZXIxcW6RR2aYQfAtJmrzgd49w061fw8ZSmFoZ4TrrwL3Ljm6Z3kZ7JGRsZNsa0SfgTGpi8tG6A7Bm2iU1kSak5wqlBWbXvYnnxbqNK/6V61YOaPNSxW8yTUMbMDyksxHY/OW/ww/5ycitBiH+o1NSiVkeIOJYP2o+4dBNy/OeLesW0HSefvB6cC9x7gwIcbH/4GN9AHYfSz7bT4JetzJLpFfV4MRrjfCRFXEAgAP9aD4JPLj6Dd9tmn4WaAtR3AXhdOu977rT8kxrfDvx2LNhuZP4EgA1GCcPS0wjuh3iwq7QLoAkwpq0PP8UhF2OUsfm7uG+T4vpY5e+banrrfSNvpyVjpkmS+Zsr0KN8eAvBhWFlauZLFoowrdvvCOqVOI4lM8DPw0+90d0dHLYCaikAvWRdt6EYQAJylKIfKDyNIgKg/ko/hqY9u3YT9F4qDgOprTy4LpCs4UyToAZwxymizou3zXA3AnnBbiwe6wQRFqnz6jyiD8OwHi42yoO+lBxyHqQJWSG7JmObOkPuHL71oA2k2hrQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd b/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd index b080f689..babad2aa 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd @@ -1,6 +1,6 @@ { "PageType": 0, - "ColumnCount": 40, + "ColumnCount": 45, "RowCount": 13, "CustomNames": [ { diff --git a/Pages/项目/项目首页/项目首页.json b/Pages/项目/项目首页/项目首页.json index 8f4b3e89..bf726f01 100644 --- a/Pages/项目/项目首页/项目首页.json +++ b/Pages/项目/项目首页/项目首页.json @@ -351,7 +351,7 @@ "ID": "2d7d267652364b68a72cc98b6606e67f" } ], - "ID": "25bd706d-730e-4ce2-988e-1bc1c59fa29e" + "ID": "9936cb0c-8451-45de-a114-5620082a4a26" } ] }, @@ -397,7 +397,7 @@ "ID": "2d7d267652364b68a72cc98b6606e67f" } ], - "ID": "6fda14c0-3272-4f28-a178-5a9fbbdb8187" + "ID": "1400bca8-6bcb-482a-9b02-311d110368ac" } ] }, @@ -407,7 +407,7 @@ "Title": "加载中" } ], - "ID": "25a8e338-6982-4177-a998-00136b0fa1f9" + "ID": "e6f9d263-429f-4d4d-a80d-421d217d48f0" } ] } @@ -495,7 +495,7 @@ } } ], - "ID": "eb1d5703-732a-467a-9163-ea497725c3df" + "ID": "a2877c2a-caf3-40c5-bb18-e4f145accd17" } ] } @@ -545,7 +545,7 @@ "ID": "9b783f6a83594474bd58c4a4ea74efe0" } ], - "ID": "d28eb83e-1ef2-44a8-b7b4-85eeebc45774" + "ID": "eb8e6cfe-db9c-4117-8c9b-be95faf38fa3" } ] } @@ -572,19 +572,9 @@ } }, { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "ACT_HI_PROCINST_View", - "ColumnName": "ID_", - "GUID": "a516775a-325c-441a-8a12-3d23e7489fd2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目首页!立项流程实例ID" - } - } + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "Forguncy.Page.reloadBindingData();", + "ID": "3cb8f585736b4bd480bd36b20364ede5" } ], "Text": "刷新项目", @@ -784,7 +774,7 @@ ] } ], - "ID": "58fbb8ed-9045-4f6d-a9a1-6d58d21a9316" + "ID": "e1096c3a-d5f8-412c-980d-88d62ce1871e" }, { "CommandList": [ @@ -804,12 +794,12 @@ } } ], - "ID": "e90a1861-f6e7-4ddc-83b5-693199a0654b" + "ID": "7aeb7cc0-6291-42e8-91ef-4691e76701c1" } ] } ], - "ID": "caf09773-962f-43f4-a993-41f97c8baa90" + "ID": "7b015ff0-91c1-43f4-bd69-8d2d0d4876aa" }, { "CommandList": [ @@ -856,7 +846,7 @@ ] } ], - "ID": "491f66b0-f5f4-4bff-819f-06dda103e92b" + "ID": "1c7d2e56-f214-4a46-b6f3-e5f276e386f3" }, { "CommandList": [ @@ -873,12 +863,12 @@ ] } ], - "ID": "881f5f37-7cd9-469f-be55-4dc49eeb427b" + "ID": "cb3844e5-cc0e-4930-9fd5-944570c2bc37" } ] } ], - "ID": "3e93cecc-2cea-4705-8b06-074ad923767a" + "ID": "936ad91f-3ec8-4c0c-bf35-6c09aa59c68e" } ] }, @@ -932,4 +922,4 @@ "Formula": "项目首页!$S$3" } ] -}//3+K8dhk/ohhqsQdhrza4OEFxVCVt2L0lwoZtdn79uOxQGRD+vgkfIbHIpgVdsY3sH+RW5GWbgFTj7CAFGKGLmMcVEQvgS0+VwLb+bq2DbCH5svfEYfgCdNWFHAlbdl7//V1MgzLi3X8us5288y0wP6IXRdVFnaO83TtVo6R/Ko/e/MnY9qv+OvLPWCze92f+VGgAqBQX4jhskWYf/No7N+/K50DAYlfzgNtMbBVSq9BzLzUnG92zRPXqqNIjo3FjP6OXMfSCNx7ii8hL9Vh8QBpyOLOziHRDo0xwF/iMNwHbtmxyluSZJyYwtSNIjYet44Eacxav8CAw6fmhkLG7M7UUSau4c1DijLzWgc/T2uvWB1mTbIBimDzjI5/amaFz2ERKjCz3jur4opMJnYzhahtbA1QCxNsWntCrHRDBRm0E40sVxqfSNMHGokvdOkRWLeqFXn6ODS8pxzefrU+ahDovtoaMoGPjbTBCECRPtCKqzCgmbT+OJzfMnZtWXh2joJPfZywGnOeDTsi2Vh42tfpuy+kqbzmVJQnC5QFWDQDkxlNy4UyQrbV/t6QsRs9U+l9Psqygn6a7acDAbff53bxNM1BmCNlKNyKjkv0HIN3Z9z6/t0SJ0h7IYpaIK36Spgb+lDbuhcvbvpBiJlCpSyobaxNMlrZk4aglU51tQtPw3wPhNgj+liekD2AE4ReapJx+zsemYo2M7ulbq0yjZlCsHaEJ1KZ2M7CYKO2vEcVTTdjH+1xomSyd3irwgBoNa1kos/pcubL6oviTCkEgSuwSVM2AhofNCqaod/vbzBUfUEoXqycRrH4OqMIG0y0ta8wIJC34tlcHZ4hQyoHlRT0WmISWEY/mLCIusopb0Bqd/G/6HMDMDx6bmJXG1OWgLbNdW7hb5/vxZKIBTFXvJQ==|920 \ No newline at end of file +}//JcPjWdptvriPWPR455umIgYgccje2+RedI30Sy5cqvwx9RtvNIK8QUma/ymlA3E4ISqf1P+p+JY8E38yZcD2mA5HIuMcwB8FJS1Gnxrw3DcKvxRPGv2fWRyj+NkZPIFXpH3jsjj3O+CXQ8HCMFdxBdzzjspbmT8voV5p68DJoikF1CrXUsvgYoH8TmKmwDcNvfoLajw20k3HBC/Ab+u/1GXUXUtwxj7rQ6UJWZPDO/suz/uH1wlidK4bC3vjqqUNasKyoEuZs94cGrZTZ27EEqMbQQkzlKtbDhtTUwEAM7VHqZCWsC5R4WjBdVew012RP6PO458hjpxjHERGHzv9eFya5ovusdTIO24Mrwspyp0ypVZeDVup7D4ggeESU7XoJR2gS6zT9jt1v2746SJ6hnusgD7YP50rglq9ZVqGd+6mUJCrJxgrwV+S6bH2hYcIv/mV6jUkhW6raNs6iTcZWqmwNt88w2i16frNYYRrgGrAp6DXPvFUTE/lPFF1q4+wE376Uyi2kT1u/ktrfaeL/XkHA0Cl8fIpJOuXfVevg0vv7OhrVQ/wJ1j5DkXVms/XXivMyj0FFiarPdwh6U8qD3u5YH3bT81+sMxuPlid1i/W6mbfVidLmHaqLYs18sKjAjJ1iyJYt+Jq9qpibf12Z/i+9fJlBkpU2Waxgtii/Pjc9/xuxfHyciZLnXupNoWxqwgzIBeKPL8qj+FH6OZppuf8KCNiY3adZChljF78cSv6JkLKCyyTysGcT2fYAujtFUJ2LmQhiNn1mQKWhgLV9gOTda8EfZMFM+iawxl9FwgeS3mm3RYanMiyTAO8q9ydNsIh7FOILLfcqgCgrLM5xZSMxISKIBb30E2V0JE9C4TtJnnuFHccpq36pfVi/TG7sQnrZ6tWjNLg0MJlPIP0iw==|920 \ No newline at end of file