diff --git a/.collaboration b/.collaboration index e58fc06d..5f0b6035 100644 --- a/.collaboration +++ b/.collaboration @@ -646,17 +646,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-12T15:38:08.4032405+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", @@ -1792,30 +1782,11 @@ }, { "ModuleName": "ServerCommand/任务发起流程前校验", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-12T15:40:51.627546+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\任务发起流程前校验.json" - ] + "ModuleType": 15 }, { "ModuleName": "ProcessItem/新增任务流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-12T15:42:47.0808729+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\新增任务流程.json", - "Process\\新增任务流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "PCPage/页面反馈录入", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json index 6a82dd01..ab345574 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json @@ -311,7 +311,7 @@ "ShowConfirm": false } ], - "ID": "748a6e15-60b8-42fc-a449-19c078a145c2" + "ID": "17af9dba-0e92-41ab-86bd-845eb2c0b3fb" } ] }, @@ -336,6 +336,11 @@ }, "CheckDataValidation": true }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -354,11 +359,6 @@ "compareType": 1 }, "CommandList": [ - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" - }, { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", "FourStandardStyle": "failure", @@ -371,12 +371,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "192f4446-af5d-4baf-96f1-547fda3e5ef0" + "ID": "76d9e4c6-aa86-4edc-b088-2bf6012b0db2" } ] } ], - "ID": "69ea90bc-6a4e-4ad1-8c8d-f37257536a68" + "ID": "e0470b65-14c6-4464-9068-ac3fa49c1cff" } ] } @@ -424,10 +424,15 @@ "ID": "e2e848e0e72d48229c97757429d446a2" } ], - "ID": "fbf205d7-21a3-44ee-9ad5-ffe08f681acf" + "ID": "8349b435-0e46-47d3-ab6e-618977ddf07d" } ] }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { @@ -436,11 +441,6 @@ }, "TargetType": "Forguncy.ProcessPanelCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", "MethodName": "Refresh" - }, - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" } ], "TemplateKey": "同意", @@ -638,7 +638,7 @@ "MethodName": "Refresh" } ], - "ID": "280384e2-a164-4d9f-a926-2b3905f362de" + "ID": "8d158f91-8d59-4441-927f-4d8e9487b206" }, { "CommandList": [ @@ -653,12 +653,12 @@ "BtnText": "知道了" } ], - "ID": "9911357c-b9de-406b-aea3-33b4976259ea" + "ID": "cb53ff0e-92e7-434e-97d4-b8825ee80a91" } ] } ], - "ID": "e22a7b46-42b4-44c0-8a3c-e6c1a3fae663" + "ID": "a7478159-5751-47e5-8acf-0027fba02d23" } ] } @@ -778,7 +778,7 @@ "ReloadData": true } ], - "ID": "080b67ae-f701-4ae8-823d-c488b97ffd35" + "ID": "33b1b50f-7b2a-454f-94fa-fe3e1e9aa724" }, { "CommandList": [ @@ -793,12 +793,12 @@ "BtnText": "知道了" } ], - "ID": "a675bb17-562b-4a96-a1ec-fa9d74bd3943" + "ID": "009b1b9d-6536-4431-b904-55679cd8a93a" } ] } ], - "ID": "48b3b50c-bf0c-4379-a0c0-ca13587dbb7f" + "ID": "ace89907-6c5a-4fbc-86c3-1045271831e4" } ] } @@ -939,7 +939,7 @@ } } ], - "ID": "81cef670-a73b-4377-a438-8445d0b0a9e5" + "ID": "496130ac-6857-404a-a3c6-b1fb7a0d6add" } ] }, @@ -980,12 +980,12 @@ } } ], - "ID": "1d320c19-185d-4db4-b7bc-0fd18e2fe123" + "ID": "4a1da7f1-8f8f-44c3-843a-31137616a455" } ] } ], - "ID": "87dd274a-ab77-4c35-8e78-ff598d4f21e3" + "ID": "d672b81a-41e6-4a54-9998-9c2179860551" } ] } @@ -1046,7 +1046,7 @@ } } ], - "ID": "e433dc30-ed5a-429f-b07d-90ced73b6557" + "ID": "6152b2f4-d583-4123-b28b-98ab7e4f09c7" } ] }, @@ -1087,7 +1087,7 @@ } } ], - "ID": "7bf77fbe-b68b-448e-94ef-a9d63a8e0568" + "ID": "182386a7-0c0a-45be-83d8-7a8810353fbc" } ] } @@ -1202,7 +1202,7 @@ "Disabled": true } ], - "ID": "a9dc84c6-834a-45d3-8af1-a3b1b3aab8fe" + "ID": "a2966ab9-039b-4f63-824d-c791546f9ab8" } ] } @@ -1380,7 +1380,7 @@ ] } ], - "ID": "3c5aea19-84f8-4890-a671-99b7dd6cbdf3" + "ID": "07787521-fc76-43fd-b2b7-ed54ad49f742" }, { "CommandList": [ @@ -1397,7 +1397,7 @@ ] } ], - "ID": "065a8009-900f-4fac-82aa-e78cf4801973" + "ID": "8e770559-1bfc-42ff-9431-c5dca7b3b394" } ] }, @@ -2171,4 +2171,4 @@ "Formula": "任务首页!$Y$8" } ] -}//Z6pKj2M34yprIGEA8qE9vMQDA5ZWRkkoAsFobEVJdz37EdSGh7MIoP+d1/wbcP4slvpNrTVRaBRcs71GZwitklgcdUjngmnQtdUXnvj3QDxI6i1m+uenU1EHEg0H1FlC9wfoYUR85VfRwCCdiFFKAO2sS+HiURtnTtHrP3Y23GmJJKDqncHsFmQum8whR6QY5Wxkq0MpiY+8FklvaxDVrarAjQkPAaAVbbaruBbdxU+5sGflVmwNoUqUHA746l2RbdIPfnxIPmIRid7BBVkl6yz1vBt8lMNA8g6sLKGB4qOV8yxeqFrxcHM4j9BHCtQARRSyoDLgDEbghDhPc2mDz9Te4p7uC160Ia/J0jD3ga6o2+PBFq3/979vc6r05BAtoOJ0zVGHS2PPI7/oDkc31WwgonzzlPx/SowE/mnksmb8Fyca9ntCt9Eb/e+VXdpHqNJ/VED2mQWFFnmgyhzLa6AXQoWJBYKmjlZNVAV0AeUwGYpxdJUkeFg1Vlu8lgYfGP8NRO9vGYOgloZIIfxWMl9gxGJGujYhuijFK9bfKWWxqHArss9767pjrwTiRso2rRj4GjqymRjDgj0sbYpZN+7BdC+3D0jK6bjRf3OoSRBKJVuCrzP8nlyfdGXqLJHpxaJoWdoyFqLGba8ENSwuy0sQJbKH557Ero2P3sZxtueOrJY7QQsy81ZIdE+NkV3id4XenzKs+sOnFwA4bTpkYHEOMpcIpe8IoYzNH3kX19rRh4WRGyJ6IxindVw9M5iaddNf3v8Yh86Mv2j8UvGJlAQ5qSQU28NSzBjzZnUCFSJIAsCP4LaBbOXJ6/XEo16EUnlEeUJK2Wi8WZhSFvs0PSpCcKuBJAmiq5GK7JdKUjwFv4l9Y+wykdiV1a9gQWGE0lIe/IiW1FNVI6IkBn+tUg==|920 \ No newline at end of file +}//Ve2AgKk3/w+550CwKwgAjzYA4Tcg/2PsG/bKwij0OhUnZA+LYwQbl/Tq1iiZIHP8hfp0x4RhYtrTRAkFSd+4fr25RRSlId8qGaoUedG7Ftkvj73FdV0Y3xb1hNpfiGtJyiYhvc/z9QRYiTHBPx6ZVxpK2w0Mkxl9URHq0eloYwynxyQMIBAOk2FuxtHAHn/P6GkaffD7IpTADF1dgiBSrpdmbMEl6EpJoMM3znfamqsikEm0RDCzZ0ypCBXK1uDTFn7nkcYlScNhKyUGF+6EVF8TyjuL9geZsFR5B1+HfP1qkF6jBLQGwrPtKNvy/Bcgrvx6i37Ref5gVpVp+OBGV/On9SEU7gksyHXI442HD7PVB+eUMUZLMWNogLDNr9+CsNF2RVQHKEcoCnaQgZHJBbCs527hJ/4tgWsveVkH9NmeHT5GuLWawjaIP/XLFTmUhSQDpIVii002TYJIgC8J5uzckDyljrRdmsO8TFqAuXzCzPHy5xesZSmojPXO9aUbtNX/lm5Z/JRSOHqWazyCril3DXxplMulmMXTdAkGFzgf1hjSC9psPEb1exLke2zCcnC0bgnWAiWJACIjHbwyrhZX8SAtUcldmZfHUbZY/WPwz0lxWTLKgyWnjSrbI8nIMMk8XRlPNW3jKv4ZYW7gdc5UNriwOKEIfDVrMtqTqlr/cjOdWtLzo345ktSfjAo2arlYibiNe/1vXK4hXCfOhPxQiN4UVlBV72/6dWNQcwBC8DkEbtbH6jKceh4K8bu8ft7cI1PrAltLl3aG3mxLQN/s22/ltb9SicbJslQEn0whoUhdBgQq0cv0Sr+tEEG3VS2w5eLgBhqbyzQu8Lgeqaqmry+GqBV3m3kbFmA6/uo8qSayf20zNvZQC+eDRD7F8B1DPcKSQB2f6tdFoICA7Q==|920 \ No newline at end of file diff --git a/Process/新增任务流程.bpmn b/Process/新增任务流程.bpmn index e485d00f..a79422ff 100644 --- a/Process/新增任务流程.bpmn +++ b/Process/新增任务流程.bpmn @@ -4,7 +4,7 @@ - + @@ -14,14 +14,14 @@ - + _4f4ab1b2-ce52-46c6-bcc8-52c43b0c4a9f Flow_0otbu5x - + Flow_0otbu5x Flow_1bfvbmv diff --git a/ServerCommands/任务/任务发起流程前校验.json b/ServerCommands/任务/任务发起流程前校验.json index 0266399b..88518141 100644 --- a/ServerCommands/任务/任务发起流程前校验.json +++ b/ServerCommands/任务/任务发起流程前校验.json @@ -43,7 +43,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "f2d81556-ab55-4731-87c8-2ef6dc3b8390", + "GUID": "7a31149d-43cb-4fde-8426-8ccb701dd060", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -52,7 +52,7 @@ "ColumnName": "项目ID" }, { - "GUID": "6b5a65e5-2d38-4552-8325-29978f5bf07c", + "GUID": "8a7ba34c-6d92-4dfb-8b4a-d92ff67805c1", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -66,7 +66,7 @@ "ColumnName": "严格模式" }, { - "GUID": "3b6b6225-a8f2-4428-ac2b-5bacc8aeff24", + "GUID": "1ecf93fe-37c5-48bc-a2ce-e7c7b473b6cf", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -80,7 +80,7 @@ "ColumnName": "项目可分配工时" }, { - "GUID": "93b3deac-ce8a-4163-b369-da71413992d3", + "GUID": "210d3ce5-12f1-46df-b929-7f291ddabc1e", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "项目ID", @@ -94,7 +94,21 @@ "ColumnName": "项目经理" }, { - "GUID": "f416e1d1-3931-4f6e-9b99-28911cb1368b", + "GUID": "428e7d59-ed26-4f0f-9a0c-38520817fb68", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "78c95388-c35e-44e0-a245-d2376153020f", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "项目状态" + } + }, + "ColumnName": "项目状态" + }, + { + "GUID": "4c6c8cbf-5e89-4cd0-b08e-e20d6df70dff", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -103,7 +117,7 @@ "ColumnName": "任务名称" }, { - "GUID": "395821a1-25a2-45e1-9bf6-e701c2d97ef6", + "GUID": "d0b133e7-d427-4d99-ae37-ccd184a0b6bc", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -112,7 +126,7 @@ "ColumnName": "任务负责人" }, { - "GUID": "02361f6b-cdca-423f-8e4d-3db1023d8c65", + "GUID": "87745f89-1f60-412e-8c15-5f8090261fb2", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -125,7 +139,7 @@ "ColumnName": "任务负责人_全名" }, { - "GUID": "25f0ac07-cd61-4518-a914-9e0a3f2b97b0", + "GUID": "c42e34c3-7fdb-4408-bd50-a3d0d0a26339", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务预算工时", @@ -134,7 +148,7 @@ "ColumnName": "任务预算工时" }, { - "GUID": "f26bf7ca-95bf-4f22-9095-489d2762c417", + "GUID": "0a82cb81-f3bf-4a6a-be20-4cfa6be6c389", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务类型", @@ -143,7 +157,7 @@ "ColumnName": "任务类型" }, { - "GUID": "9dba06cb-c256-4b07-b09d-ab48d689fb3b", + "GUID": "0c90ee57-f5fe-4409-bbfe-fc82a013d36e", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "版本", @@ -152,7 +166,7 @@ "ColumnName": "版本" }, { - "GUID": "1f550c76-91e1-4716-8b59-7db72099ff34", + "GUID": "9020a9d5-3b67-4bd8-8672-067b42b1489f", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -161,7 +175,7 @@ "ColumnName": "任务状态" }, { - "GUID": "d1c1cddf-db47-4d81-9165-54a2f2a0b974", + "GUID": "93a39474-a25f-4dac-aa3e-22f703f78590", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "流程实例ID", @@ -170,7 +184,7 @@ "ColumnName": "流程实例ID" }, { - "GUID": "6be8e55b-4f64-4b06-9512-cb11970c3541", + "GUID": "c875121d-bf71-49fe-8940-2b074144f87f", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -179,7 +193,7 @@ "ColumnName": "父任务ID" }, { - "GUID": "4207d524-41af-48ee-8e0a-9e7bbd3153b1", + "GUID": "4e8c5b2a-92f9-463d-9210-02e5a095e2a0", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -193,7 +207,7 @@ "ColumnName": "父任务可分配工时" }, { - "GUID": "c3efe081-b843-4300-9b80-5f55da0f8e34", + "GUID": "b8dd4752-ce62-4b77-a87f-04e772245362", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -221,7 +235,7 @@ }, "TopCount": "1" }, - "ID": "e8265f2c785c461b936a8cf4271090f0" + "ID": "c9827988ce994d8bbc64e2644432122f" }, { "$type": "Forguncy.Model.ProcessInstanceCommand, ServerDesignerCommon", @@ -235,6 +249,33 @@ "SerializeProperty": "=任务信息.任务负责人_全名&\"分配任务\"&\"[\"&任务信息.任务名称&\"]等待接收\"" } }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目状态" + } + }, + "value": "2", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "请等待项目审批通过后,再提交任务!" + } + ], + "ID": "94a51cf6-f6ad-49df-b7d5-18c40a6fb11f" + } + ] + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -275,7 +316,7 @@ "Message": "请等待父任务审批后方可发起!" } ], - "ID": "c6e846b5-7a58-4aa4-9586-da098bcb80c8" + "ID": "8a5c3b7a-3e0f-4bf9-ae22-894757b38c2e" } ] }, @@ -301,7 +342,7 @@ "Message": "当前项目未指定项目经理,请指定后再试" } ], - "ID": "8a138cde-55be-4875-89a8-ece1875a779a" + "ID": "3d087976-a992-48f3-9259-6b83865b3724" } ] }, @@ -327,7 +368,7 @@ "Message": "请指定任务负责人" } ], - "ID": "90b5051c-5cf5-486c-85cf-b24a9202a8bb" + "ID": "ee7b931c-0bcd-402d-9082-845bbe227af9" } ] }, @@ -353,7 +394,7 @@ "Message": "请指定任务类型" } ], - "ID": "25a587e9-40ec-4674-ab47-3d1ca0fc54bd" + "ID": "bdc32952-704f-4965-a2a8-ec2df0398633" } ] }, @@ -399,7 +440,7 @@ "ID": "dce9e9bfa9454e68a44bc81b7559c096" } ], - "ID": "3b0c61b7-4462-4f4d-9445-8aca9294039c" + "ID": "10547d07-8179-4949-866b-f3a7f0c1d2de" }, { "CommandList": [ @@ -413,7 +454,7 @@ "ID": "149f6070b4f94a4aa8f1b7106553337a" } ], - "ID": "3c3ed4d6-f6bd-40e6-885f-6f0a2c4e09be" + "ID": "287935c4-a1a8-4cbe-a727-46201b040a3a" } ], "Comments": "严格模式下,根据是否有父任务来计算本次预算工时的上限" @@ -447,7 +488,7 @@ } } ], - "ID": "5653b3c9-2877-4aab-8d5a-255ea39acd1e" + "ID": "70cf284b-237b-43a5-b9a8-2d9231af215f" } ] }, @@ -477,12 +518,12 @@ } } ], - "ID": "0b140361-0f9d-4242-8475-e109b935c2a6" + "ID": "2282241b-e0e8-49e0-a9bd-d387311e2d65" } ] } ], - "ID": "c0a5dc55-9938-449a-a6b4-4975853e25bb" + "ID": "2ce6ff5f-b124-4079-b91c-285ffb31b403" } ], "Comments": "校验工时情况是否通过"