diff --git a/.collaboration b/.collaboration index be60bea4..fda22ea5 100644 --- a/.collaboration +++ b/.collaboration @@ -722,17 +722,7 @@ }, { "ModuleName": "PCPage/项目审批", - "State": 1, - "LockedBy": { - "UserName": "DESKTOP-P7DCA12\\ZhuanZ", - "Email": "269252963@qq.com" - }, - "LockDateTime": "2024-09-10T17:48:33.3357693+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目流程页面\\项目审批.json", - "Pages\\项目\\项目流程页面\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目列表", diff --git a/Pages/项目/项目流程页面/项目审批.json b/Pages/项目/项目流程页面/项目审批.json index a2a8444e..5918363b 100644 --- a/Pages/项目/项目流程页面/项目审批.json +++ b/Pages/项目/项目流程页面/项目审批.json @@ -504,12 +504,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "6676eb9f-87b6-4ae7-95ea-8325bdfad83a" + "ID": "f707e19c-c4f1-4c02-bcc0-a59beb189ba8" } ] } ], - "ID": "c36a50a9-c6c5-4be6-abe3-52c8218a24f2" + "ID": "cdaad422-6a1b-45c3-9ad3-aefce7d3ae7f" }, { "Condition": { @@ -535,7 +535,7 @@ "MethodName": "Refresh" } ], - "ID": "db946cc7-cb7a-4ead-9b43-7e54968c6467" + "ID": "6087095b-41e5-482c-ad5c-d5487eae0adc" } ] } @@ -1718,7 +1718,7 @@ } } ], - "ID": "89423597-691a-4ba7-8e27-be8b099e9d4f" + "ID": "287b13ab-ca55-48b9-8681-e064b60e5deb" } ] } @@ -1823,7 +1823,7 @@ } } ], - "ID": "1defb16c-4e20-4805-945a-2b1edafb9a9f" + "ID": "6ad616b0-1393-4f77-9bfe-588208801b9b" } ] } @@ -2377,79 +2377,6 @@ "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "Title": "立项", - "PageLoadedCommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "获取参数ID", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=GETURLQUERYVALUE(项目审批!id)" - }, - "ID": "f8fcf94e8fce4898b5c05fa29f4fbc6d" - }, - { - "$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.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目审批!项目ID" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目审批!获取参数ID" - } - } - ] - } - ], - "ID": "3c2e47a1-6e7c-4aa5-b777-aff41573a290" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "7cffe0c8-0814-4474-be69-79310ba9545e" - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": "未找到项目", - "BtnText": "知道了" - } - ], - "ID": "efbe8e0e-0111-4e87-9e31-339346bb1ae3" - } - ] - } - ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -2482,4 +2409,4 @@ "Formula": "项目审批!$L$23" } ] -}//KvdLstfLFNdPGj/pFLrIDJOpYZnzXse0lq7iPURD8qj+SPFibsV8u9TSyIToLAtdQ4R/MYjaKzycVyqnPTHR9jU44fa9bTnhP0yGo+gV6qn37xZ8xoYz6zKrHQ2CRipidp6rwLVYF0TdmhDADOM1uI+Xn/CIoEibItmvFlUWaGOaAEyNAn2X7DYmlN9/w109SaQjYZIoc7dIUq+sOKnFj+KIT0yr8UIBwW3RmisS8CR4xyLOglNFGvgqY7Tr20OfMzN1PP7/qsN4Ll0a0ZXN4B5B1nOJXr+ajTf+JCFZW2EPeTM3qcrcHsc64YApx32DCcMPotjHkx2lce1zBX2xFf3OWkhz3WccAUo/XOc59ZDBWNiKAqpAdaokgO7VW/A9lvREqN4OgfqJkI8dELKrwGR2sH8vFa08JOVNFJ+AI7+ulEQQpQS06dszAGEtcn82AD3fnfg780kQx1zLQC0McwUz3nJ/TH+VuRQtwjxUgQxmv97aHSDKOh3pHjZkRKx1kIr5ySUrdGo5LZi2ByvGzFWOYSA3Qp61GlO+x8VcopJ384cYrZvwpN1w4DNPqwQjNfhWvcgPM8k0BcC0RMJrrM15SjnOjZjTMNbK7L8O18fx7E7JVtWwDlzaxLInfDhYO+vOaFGO6u7CVD15tPKWcxTcYdI+HYDo4cpBkNk33HgZV/sVC9cc6ZVCRuUwEnx/mfaeeqjEo8ie5dv15pP14YkGauiA2L8v4W19ftVDq3bz/g2RnypTtSCM0DjR2DPmdu2PTnEeRfup0H6D1z/Nixsxvrw1lnqwg6VSzrTTry6q7Q7CmrrzIHQH7dDEOGQuKNB+KVe6IWCQCmR3eafbnmPFEYSSu0cMAybLvUBCllQH10oHG/1NEvXuEIG+3ax4/29Wtr8LeMymENQD/zZRzQ==|920 \ No newline at end of file +}//W4I0jlVuizrmNh6D7xmsi5o4b597XNALp0+doFOF1as0OsUEK5DWrUBaa+rytgzq8NBI8pBuyZA9vR2KgES15sllYL+Oq/lRcPWMrrIrEZVmLRlRZmKcVKm9OZSUx5uoOFrQMPzY7iV+6WvAzo7sC0w1ak1CWRqGnwvVzNE1hi0ut1O4ZTmwbBcp5CFKGnyQ/R6erMdbhKaN8dbSBzwBiXlCZiLbcQanElzbQWKXpBvtilJJEGpazF5kI7ruK7uVoBBjyqnbYNvkpLDV2VCHwCP3zctJke2CeVps6oQBhy8o7k9A2XzxAMf3klaHE/L2EJCv+lUCa447IrWmaC8CMeE+2Fqt8XxfMj9mmCdp3gxAiVPZJuih3TmH3xoMHkC1eEeYHEFAbEK7RhF/t7Y9IlTdHlUAqPPjoqksE2LNZZrGbaeFYYDNADxXNh5Pe5rdDB7gClmQ1hhCG7dxm/eO7cg/c2VXPi3xWdrlbpuGrb28C2MI+fYVc+bdV0EAMVWplPOZIUaamXrGnym5ZAIJ0e19ML3mBAiVoiTjhhz3oNLac2QXC6/iU3XaF85c7DHEMoxBoQjIr+oK/PCvUx1xNygv0EA2ZiwsELpbmVJf7ko0c+rn2Bn9TaaFVgd7ldu7F5UrzNVQpIsue5EFEa3F/GECtLYWeLGR5UJ6eelplrTH0+n57c8f3Sn5gtNjHB67JaY+mG4I1JLg2tUGk4suEJvYdm6nEwO1bS97mu8QEyku0Zl0TuNJE3ieJR16MgzgxpIaSgahdNYGRZ/vEAElydY4JJmbUH+nMFoDgv/UpFHM4cW+epqJ+tF6Ato4eXOLpx4T7iQHNsyO4Dj7KLRF3ng7gSTR180xTfzgo6ciWW6HQjdRVYVLOsH0bc4GHcISUzmwdlh6XYKEx6oM2p/4iw==|920 \ No newline at end of file diff --git a/Pages/项目/项目流程页面/项目审批.rd b/Pages/项目/项目流程页面/项目审批.rd index 1a168c31..dfba4920 100644 --- a/Pages/项目/项目流程页面/项目审批.rd +++ b/Pages/项目/项目流程页面/项目审批.rd @@ -1,22 +1,22 @@ -{ - "PageType": 0, - "ColumnCount": 37, - "RowCount": 23, - "Formulas": { - "1,33": "IF(C23,H23,G23)", - "10,16": "IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(F11),\"null\",F11)&\"&$top=1\"),\"\")", - "14,27": "DATEDIF(F15,Q15,\"d\")", - "10,27": "IFERROR(ODATA(\"客户部门表?$select=联系人&$filter=ID eq \"&IF(ISBLANK(Q11),\"null\",Q11)),\"\")", - "22,8": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" - }, - "CustomNames": [ - { - "Name": "项目ID", - "Formula": "项目审批!$I$23" - }, - { - "Name": "流程实例ID", - "Formula": "项目审批!$L$23" - } - ] +{ + "PageType": 0, + "ColumnCount": 37, + "RowCount": 23, + "Formulas": { + "1,33": "IF(C23,H23,G23)", + "10,16": "IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(F11),\"null\",F11)&\"&$top=1\"),\"\")", + "14,27": "DATEDIF(F15,Q15,\"d\")", + "10,27": "IFERROR(ODATA(\"客户部门表?$select=联系人&$filter=ID eq \"&IF(ISBLANK(Q11),\"null\",Q11)),\"\")", + "22,8": "IFERROR(GETURLQUERYVALUE(\"id\"),\"\")" + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "项目审批!$I$23" + }, + { + "Name": "流程实例ID", + "Formula": "项目审批!$L$23" + } + ] } \ No newline at end of file