diff --git a/.collaboration b/.collaboration index 79650ed2..37f861cc 100644 --- a/.collaboration +++ b/.collaboration @@ -646,17 +646,7 @@ }, { "ModuleName": "PCPage/项目预算申请历史", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T10:59:25.8562798+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\预算申请\\项目预算申请历史.json", - "Pages\\项目\\项目首页\\预算申请\\项目预算申请历史.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目反馈", @@ -680,17 +670,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T12:26:00.4853022+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json", - "Pages\\任务\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", @@ -1130,16 +1110,7 @@ }, { "ModuleName": "ShareCommandContainer/发起预算申请", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-24T10:58:03.7907353+08:00", - "ModuleType": 36, - "ToRemoveFiles": [ - "ShareCommandContainers\\发起预算申请.json" - ] + "ModuleType": 36 }, { "ModuleName": "ShareCommandContainer/跳转当前项目", diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index 6cd376cb..64579255 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -374,12 +374,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "a8ed4e13-8243-438d-b6a4-ee7f73edea72" + "ID": "2cebc37e-164c-47b3-b97d-2c7e4352fb0c" } ] } ], - "ID": "e04236ad-a0fe-408a-b7af-fc888a83ad53" + "ID": "8e9b3723-fcf9-438d-8c24-42561972b337" } ] } @@ -405,9 +405,14 @@ { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", "Message": "保存成功" + }, + { + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "Forguncy.Page.reloadBindingData();\r\n", + "ID": "62b3d54290a24467892f7e123bd02d94" } ], - "ID": "ced0d69d-866b-4a31-bfed-58e538827e2f" + "ID": "71cb6e4b-4492-4933-a506-30ba69ee48f0" } ] }, @@ -621,7 +626,7 @@ "MethodName": "Refresh" } ], - "ID": "7a30e78c-902b-4aea-b2ea-42100ae51441" + "ID": "2a24996d-6e8c-4e8b-8c7d-317085ebed65" }, { "CommandList": [ @@ -636,12 +641,12 @@ "BtnText": "知道了" } ], - "ID": "60552c60-0d89-47d3-86cf-9f5efaa98c46" + "ID": "6a1f8ea9-9953-4662-b969-f311660a4e0d" } ] } ], - "ID": "31078c25-194d-4ae7-82f9-6eb589857cf9" + "ID": "f197ad9c-1286-44df-a2fb-2af20d89e51b" } ] } @@ -735,7 +740,7 @@ "ReloadData": true } ], - "ID": "36ade50d-8177-46de-a74a-2dd3003128be" + "ID": "90c44a87-4065-4b4a-aa0c-77de0f32cb85" }, { "CommandList": [ @@ -750,7 +755,7 @@ "BtnText": "知道了" } ], - "ID": "380d4003-de94-4355-90a5-c916865f1e98" + "ID": "12c84a30-f214-417e-a41f-f0518fbcd291" } ] } @@ -890,7 +895,7 @@ } } ], - "ID": "95c0c833-7f12-4df1-9b39-849427b00f69" + "ID": "bc8998cc-ffa0-4980-bb35-e70fb9a75253" } ] }, @@ -931,12 +936,12 @@ } } ], - "ID": "5022e804-7dab-42dd-9045-768e5173a397" + "ID": "7c9dcf85-5c86-4c07-a7a3-844ebbe0709e" } ] } ], - "ID": "e812d0ad-f488-4825-b8bd-a16c300ebae5" + "ID": "fa0c6ae0-3047-4b99-93cb-4e8a7bb0bfd6" } ] } @@ -997,7 +1002,7 @@ } } ], - "ID": "b0218800-c18e-4321-a712-0db3344d3ba2" + "ID": "5228301b-7089-49bd-ab93-a0cb24ec8675" } ] }, @@ -1038,7 +1043,7 @@ } } ], - "ID": "d446549a-15bd-4dbd-a10a-61c8cc669c4f" + "ID": "95f8e566-6f80-4510-b50f-d4d814192f8e" } ] } @@ -1152,7 +1157,7 @@ "MethodName": "Refresh" } ], - "ID": "dd0aeedf-03a8-4f49-bb2a-6d969d0b387f" + "ID": "689859e4-0a52-4852-ac6a-87fbe8088c92" } ] } @@ -2050,4 +2055,4 @@ "Formula": "任务首页!$Y$7" } ] -}//g2JEjqTkJB96xwHd8M86nXhzXHXQyvMQ4L0Xka+dUqsx1wHAlVVf3n04H5VUwPkLqRsG8NwVIb5b5iBZVCG7DVdUlI/snl5qg270p6e4GSXAn6Z5Alk0Vs+YaEBBr8WUbgb5rC56ktd/+qaw/Vj5Sc67JdQsPMtJebY7ovZFnbYQbHGlXRq/Rdk0BG7R5YncDx/G4beUCZRudHcLZll8OJv3jEoFv6i3aj9m0tWmksyZEzJQIctHESLX59WDUL3ctuJDbN83ns5rbWDEqIFn8ic2szfMVKCNItEVGx5qDemlfQVEfwEc9y70sSQMnGM9eYqNH411vU27jAtsaceciyd/8dKTvuc1dQY49Bfg5hjMCxawMXETdSHIE780AHWv40549ndrnyDDSNWyVQIQPV4dKvpoImVgrHKwio41Y4nzFsu+8u47ohj7tYdAvG4Qfg4qFJYebojxIAuO6RBdRTSqknbUjTLxZ2cfoOHBArRRYqIaoLIzTgSHDTVmejsE1nW9y70QTvWv7YWYOeG+YxSrJ0dLbmQb9Pu41gyO33PSz0X4KmrN0ZPkYuJtTGbkAPIJftHXWPBh4pgxTim6giIkKSlIWtG3bkqsMyJJndoqGkqpJgMfThebpgRyJKm2GIkYmfWQRu5/KZ84b8n8th2ovt038VEhTbPrt28QkQ100dpq4IBVvjzO3Bk7pF20tcgFs7a/7veFK0K31UM3A4S6ZfzRnn1fZGjwoataKygiEPYcMaT8xaIMHZVTjgyViCZCqRZxRQzri/HEXZVQ7XVNpyCXmJ96olvbpyK5TYZ9/RIr/b8JH8WJCS/V76RlsxeWKbbssjKuWzZ9n/9fVB7CcyAp2kgH2Y3MZEDG7aSOh5OINaKbAWne0x8AbF0DxmtBJWRMo6Djbm2UIs9pqQ==|920 \ No newline at end of file +}//EjdNQ5JZ4DIZWaBL+SLlk3PO8WwC1nArcANqYFhbwFm/L3Cq3gSXYvN7pyargdjt7AFq09eqQDvkbteZ1PIp1UqU0w0S5wubG0puh41owgk09+7sbIrNhD35N/mIEJ2eO3UoJvyRorDOaOuZLxXaGJVIQu2kbNki8OJblu/SfEarnNyGApO1EWkmPoJNssgl8EGnbYSLYgdcuiNWZPJD46F3mLtvwOA0ELf+S733BcsVwn6fGJ/RH/XHZzahECUkeHDNkTR1V/xbit7kcboXVr+FAXtvWcHlSu3mpRO1W3sYmE00EVXMaTMRg31O/nPyWPq/R4sZmulsO0UHRhrNUQuxyWmYhSCj1JqekRrnmMO8QfTAiIKrnGyTRWDlG6vJyLLl+12XVnbtA2qmVi3RMnrIfJOCaBAjJlXnEjEBkWM38J3PaOeUkd6yhK61SAC4Ws5MVY1O3J0RdzDxv4tdoXAmGMz8vzPfhpbWxsthhevTZPUAS1Nq2Tn4V9zxI/h6IW9hnPxDVm2FHwf+/ACoL+zMv7FhxaiBhdfXBZg6LIc1BDOKBKYnxvE5YXu6cwwbTEhUlb5oN2vYr4prbF+DJjMVl8ALadpbHU4rXnwyICrvCChiHGxkIZbxumsA+rn6XVQcE58tZyq/CSAnouP6+0T+lOSoajSYOL8PCMc8MZJq/N6zxZZW4c+qFfmWexZo7Ktw+TaxY7UqEtnQ1os+sUzluYDDx/BNlEfWAD8KXoQbq4F0Wte6x09pJaFZbKroECVCctIRy5Nrh29VmlITWOLGAcjFSJp93gpK3PjIinza3hP79jrjlZXMulrTABPnQQiqElui8IZ3hja477MMLWyJx436+OKIeTO0raE/DJHgYA7YZh835VJ6pcbF/qi6YBvSdPRYb0JDVxTFzCV0lA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/预算申请/项目预算申请历史.json b/Pages/项目/项目首页/预算申请/项目预算申请历史.json index 3ae0c7b8..c6517c5d 100644 --- a/Pages/项目/项目首页/预算申请/项目预算申请历史.json +++ b/Pages/项目/项目首页/预算申请/项目预算申请历史.json @@ -6,6 +6,11 @@ "DesignLengthInPixel": 24.0 } }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 @@ -31,11 +36,6 @@ "DesignLengthInPixel": 32.0, "IsHidden": true } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } } }, "InLogicalVisibleIndexes": [ @@ -722,7 +722,8 @@ "3,1,1,37", "6,1,1,4", "1,1,1,3", - "1,33,1,5" + "1,33,1,5", + "6,5,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -752,6 +753,10 @@ { "Name": "项目ID", "Formula": "项目预算申请历史!$B$7" + }, + { + "Name": "临时流程ID", + "Formula": "项目预算申请历史!$F$7" } ] -}//8MgR3bjRfrs48oBHfMEXYooeKqHTPaOU/ZFA2pbCKRbbM8JmmE6Bz21YBcobLmyQPFqv6LW6baZXmmZKrcHKjsp8EYggZDza5+oH8R0aeqW3wYVV21ZzHTnWuN97AEiWR5IwCcKnk5YjKPTZAHqSNYy6/4c8InwcvUkljRgMjaNyIEE4as+SUFzHqYAValOy/M7NQNZU12qTvciWj42//UrZV7FJkWXZBZMmOvc5ZipXwNV9xxYY5NUCaA2IBy5FmRExvxXA9fJou7sVCP4/iB2up5ecKRV0c9MzuXTQtzxKLTCXj3twGP/xu9LoByvp1iPuqDk4T4695Zz+Vbb9aSeCK8PRbTGqaGOodAJl4Manb3Eku+ln/I58A2mBi0U4O3VK835+aiKijbYv+DePQniCEqgnndb5n+WBBiGBqmuAKrBEpoW7ITHzCMyIdi/eDosajDbwJeDgfEr1BVX564hrrw1OnZxK/8qtShulPeT8p4oPv1dRm60oUkjfJ7E5Rvde6FAGf6Flf57wnmdm1MFp4E+qlyWuCnAqY+50nSbXyk5IZIPj2ISfURjhZOw0EmYmEPyTl6JfqRntRPj/3KeG3KfjySIA89lMjhR55a4XXniD5mqMX0tO6av6CCz6ZLa4ogq5HqNg8PUsTv0PMeaACYrtnHnfAa63IGD5/8+jXaZGAarhbCxc633hoNWUrNJZ/zCdCeOpjb3c4WhbRtk/bQlTDAf08qJ42J669g7nlfl+JRbr+oY8fvkIKF0h748OXO6k93hVWAGAOg9Vhnw0zzOgBldfa1PphiCLYpIIdkvaFVk3LiRUYwCSwaGfIe+1VEyaSiV5vuCP29ehKiIy7Awst9qodrk8XXibKnOISqrqzBzwR8eh6mqDM5PRoUWkNCMIx/85S9y2/pYZ6A==|920 \ No newline at end of file +}//3kk5aZtYjpmOTFea7YZ/nnH6Et2QbrYSwzsAVBohD0YdQggLpPSaQSjzhcQlb6A62CZ0gX8yt2szdwPQXEqhPrwpqgsvdR1lpytn3cdnJlKhbK6gjYQlD+hgQCcS9uhnLg2dTeVXCY6cTdiDnrSDZrUprdZw7u1B6OARALiE4uaLFgMkb2grOjbdnFkzZSn8QOVZA859NBK79rEGvAp2pWv7Jp3JU7OA9P+CHpAVtthtPpzR6+zDi/5/ncXuM5ZskhJTUxmmHYtz+8zm7otl2pqoJcnXcpt36dqbXor756OHfaZgR1jMP5bH2oLLfeXpTIYscaTEAioFtKJESwraFWlh22hnPblRwIUgBkNS8LPRiNWMo3W5vaGdpgMzr+gdceTe/XxGOFCzdyNDQgLSn8JZhMTSH4H5Jon+T82OImt2F832lBmms/xufUHSWJM7p04EhYI1raCnb+BUbMuc5il/POn1aMatSilutpez7iFqaO2u6dz0hT5CZ2nWxH+zyJgf0AIzT/L9vWlCISWFdn3F6z1A7ElbQ9A/LAt/BQgULhsT0YxfxqyzgI+iN7aKB+6wA/h9Mavn2GefyrNHmCXShoHLVI8IW+sIDSPTXc3Ive1TDyrgUYLBOljsiEuyeptlbF4uq10JHz/pzXJCzh5H4tPCRq6nj52Si5E7UOZVfmvhfDshp84JLs9MlAgINfhybf29fQC/IcszIkRdl4hIzr+VZ0p3Z0arLoPqusX/6a/Ifcuk0sP3xl+zJHd7fpTBz5Q1bHC1vv4oSrnrmisuTf63Y/xndfJEXZKbu/sC0LwZV/38Z7NQwnoLgyHMaR7AsSbSltDG2gU1U7bZ4DWQJNtg4C7ecHOIQAY1lyYGpj1isKeXS/h3oBMRvsaDs8a+m/JWYYYBWOsOfveeZA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/预算申请/项目预算申请历史.rd b/Pages/项目/项目首页/预算申请/项目预算申请历史.rd index f62ffe02..17f73aa2 100644 --- a/Pages/项目/项目首页/预算申请/项目预算申请历史.rd +++ b/Pages/项目/项目首页/预算申请/项目预算申请历史.rd @@ -6,6 +6,10 @@ { "Name": "项目ID", "Formula": "项目预算申请历史!$B$7" + }, + { + "Name": "临时流程ID", + "Formula": "项目预算申请历史!$F$7" } ] } \ No newline at end of file diff --git a/ShareCommandContainers/发起预算申请.json b/ShareCommandContainers/发起预算申请.json index 4f0ccddf..f97f88e8 100644 --- a/ShareCommandContainers/发起预算申请.json +++ b/ShareCommandContainers/发起预算申请.json @@ -146,69 +146,164 @@ "ReturnResultName": "发起流程结果" }, { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=发起流程结果.TaskExists" - } - ] - }, - "value": "1" + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=临时流程ID" }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" - }, - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "FGC_任务详情", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - }, - "TargetCell": { - "SerializeProperty": "传参1" - } + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起流程结果.ID" + } + } + ] + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "搜索", + "TableValue": { + "TableName": "项目预算变动表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "流程实例ID", + "GUID": "a468a593-0cf8-4be3-ac32-7a2de8ba2421" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=临时流程ID" } - ], - "LoadBindingDataOption": 1 - } - ], - "ID": "fc4c69df-e7df-4feb-a121-7e98b0c9763b" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" - }, - { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"申请流程已创建,请前往我的待办填写申请单!\"" }, - "BtnText": "知道了" - } - ], - "ID": "c99b4757-1e7d-4248-b157-ca094c3220d6" + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "094f63c6c39f4991b0699b47afb2e631" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=搜索" + } + ] + }, + "value": "0" + }, + "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.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=临时流程ID" + }, + "Value": "%Null%" + } + ] + }, + { + "$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": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "已为您自动删除流程" + } + ], + "ID": "b65b1040-f5dc-4b1a-a56d-b65100d554a8" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "您取消了流程填写,如有需要请前往待办结束刚刚发起的流程" + } + ], + "ID": "23ed7bc4-db33-4a4f-b65a-10ba8c237d3a" + } + ] + } + ], + "ID": "912841a1-f26a-4ce9-8b39-a221efcc0154" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, + "ValueFormula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起流程结果.Page" + }, + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + }, + "CellName": "项目ID" } ] } ], - "ID": "f0f69aab-a377-4aeb-9371-9b4fddf5ad0c" + "ID": "b9f2e843-8bc4-4d96-a190-332cc085f351" }, { "CommandList": [ @@ -225,12 +320,12 @@ "BtnText": "知道了" } ], - "ID": "466b077c-1443-4b43-8f57-6f9d8a64866a" + "ID": "edbe6214-fc13-4697-9d64-d77699ff2b04" } ] } ], - "ID": "8ba8ca18-5aed-4899-9ec9-aa23f7ffe0e3" + "ID": "0a142ab9-0974-4222-b312-4407e52603c1" }, { "CommandList": [ @@ -247,7 +342,7 @@ "BtnText": "知道了" } ], - "ID": "66e25299-c45b-4c4c-80a0-431c265ff1c0" + "ID": "383c1746-feec-4232-a196-24dc51ee0c32" } ] }