diff --git a/.collaboration b/.collaboration index c1812cd1..704b6d3c 100644 --- a/.collaboration +++ b/.collaboration @@ -2070,17 +2070,7 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-28T16:36:06.6660371+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\个人日报\\汇报详情.json", - "Pages\\汇报\\个人日报\\汇报详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报列表", diff --git a/Pages/汇报/个人日报/汇报详情.json b/Pages/汇报/个人日报/汇报详情.json index ca119732..31ef7bf3 100644 --- a/Pages/汇报/个人日报/汇报详情.json +++ b/Pages/汇报/个人日报/汇报详情.json @@ -266,7 +266,7 @@ ] } ], - "ID": "b2611038-0252-41e3-87c0-ea9b93e172b0" + "ID": "1dc210f0-daa9-4b9e-85c5-98dacda59220" }, { "Condition": { @@ -302,7 +302,7 @@ ] } ], - "ID": "7cb1d836-a5c0-4abc-be46-a2142de96e6f" + "ID": "f766275d-012e-4196-b178-1480060a529b" }, { "Condition": { @@ -338,7 +338,7 @@ ] } ], - "ID": "1a83ba64-3824-4a74-8b7a-471f737b20af" + "ID": "d57340ae-308f-48d0-a957-97e10052ea1e" } ] } @@ -637,7 +637,7 @@ "ErrorCode": "0" } ], - "ID": "611960c9-7026-4d46-a27f-d6b0d6823d54" + "ID": "536acc1c-ea2d-4842-b4f8-9747b6867069" }, { "CommandList": [ @@ -647,7 +647,7 @@ "Message": "必须指定成员" } ], - "ID": "44800c85-b39e-46ad-8a7c-a6c7b1509add" + "ID": "cffeb1a3-3b0e-41a0-b0c1-94a035230e14" } ] } @@ -1032,7 +1032,7 @@ "ErrorCode": "0" } ], - "ID": "19885718-23c5-4f24-b3a8-9bb444ec5a18" + "ID": "fbea1ea1-c537-4d60-bc62-b7b9a372f0ac" }, { "CommandList": [ @@ -1042,7 +1042,7 @@ "Message": "必须指定团队" } ], - "ID": "14872953-c6f8-4b2d-84c6-b1239b174327" + "ID": "33a6dd0f-cdec-4f38-b7e6-2b19a2a2ce9d" } ] } @@ -1173,7 +1173,7 @@ "ErrorCode": "0" } ], - "ID": "76e46eca-36d6-465d-8ea2-ea8572448a69" + "ID": "8ad50c9c-a1d7-4edb-b257-ad47914c90a9" }, { "CommandList": [ @@ -1183,7 +1183,7 @@ "Message": "必须指定项目" } ], - "ID": "582d6db7-1aeb-41d1-b655-5e55d1c626f1" + "ID": "f29b3d98-5b76-4b8a-ac47-a9c2ce12aba9" } ] } @@ -1253,133 +1253,52 @@ ] }, "CommandList": [ - { - "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", - "Title": "提示", - "Message": "将为您清空当前汇报内容，由报工数据重新生成日报？", - "Type": "warning", - "ConfirmButtonText": "确定", - "ShowCancelButton": true, - "CancelButtonText": "取消", - "DialogResult": "结果", - "AdvancedSettings": {} - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=汇报详情!结果" - } - ] - }, - "value": "confirm" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!汇报ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!内容" + } + ] + }, + "value": "%Null%", + "compareType": 1 + } + ] }, "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!工时" - }, - "Value": "%Null%" - }, - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!内容" - }, - "Value": "%Null%" - } - ] - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!内容" - }, - "Title": "加载中", - "VBalidate": true - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "根据汇报模板生成内容", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "生成日期", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!B7" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "汇报类型", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!汇报类型" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "汇报对象", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!汇报对象" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "对象ID" - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "汇报人", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!成员" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ - { - "ResultPropertyName": "生成文本", - "ResultTo": { - "SerializeProperty": "生成内容" - } - }, - { - "ResultPropertyName": "返回总工时", - "ResultTo": { - "SerializeProperty": "总工时" - } - } - ], - "CheckDataValidation": true - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!内容" - }, - "Title": "加载中" + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": "将为您清空当前汇报内容，由报工数据重新生成日报？", + "Type": "warning", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "DialogResult": "结果", + "AdvancedSettings": {} }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -1391,64 +1310,190 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=code" + "SerializeProperty": "=汇报详情!结果" } ] }, - "value": "0" + "value": "confirm", + "compareType": 1 }, "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!P7" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!总工时" - } - }, - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!B15" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!生成内容" - } - } - ] + "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "cf51b86c-4c68-4059-8583-6fe69a48bf0d" - }, - { - "CommandList": [ - { - "$type": "ElementUI.Commands.ShowMessage, ElementUI", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!msg" - }, - "Type": "info", - "Duration": 3000 - } - ], - "ID": "dcef725e-378e-4c0a-86c8-62ad3841be88" + "ID": "0a3ccbe0-91bb-40bc-a85d-91df17d322de" } ] } ], - "ID": "e7d91df6-2861-4fb8-bd6b-fe70ffbd493a" + "ID": "54b5ea51-43be-47aa-97bc-910013150369" + } + ] + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!工时" + }, + "Value": "0" + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!内容" + }, + "Value": "%Null%" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!内容" + }, + "Title": "加载中", + "VBalidate": true + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "根据汇报模板生成内容", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "生成日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!B7" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报类型", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!汇报类型" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报对象", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!汇报对象" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "对象ID" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!成员" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "生成文本", + "ResultTo": { + "SerializeProperty": "生成内容" + } + }, + { + "ResultPropertyName": "返回总工时", + "ResultTo": { + "SerializeProperty": "总工时" + } + } + ], + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!内容" + }, + "Title": "加载中" + }, + { + "$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.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!P7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!总工时" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!B15" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!生成内容" + } + } + ] + } + ], + "ID": "8acfa307-5a16-4fa3-932a-2650dcd3abad" + }, + { + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessage, ElementUI", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!msg" + }, + "Type": "info", + "Duration": 3000 + } + ], + "ID": "c84f0a7f-706d-4930-ba15-3c4cfc438972" } ] } ], - "ID": "2c3919ff-4aab-4e28-a84b-86964f7facf4" + "ID": "58abaa2a-ccfd-4ed4-abc4-b103a08357f1" }, { "CommandList": [ @@ -1466,7 +1511,7 @@ "AdvancedSettings": {} } ], - "ID": "053c82d2-89d3-4726-95b9-abb6b01364af" + "ID": "a10ea15a-94ce-4323-9964-869492ecd7c7" } ] } @@ -1669,7 +1714,7 @@ ] } ], - "ID": "03f2ab58-8f79-483a-8bcd-c2413c037844" + "ID": "15aa4217-459b-4943-9e86-0eef710c76e6" }, { "CommandList": [ @@ -1811,7 +1856,7 @@ ] } ], - "ID": "f21c9b9e-dc42-44a7-a46f-e59c38f42f1b" + "ID": "a359a620-dac1-4614-8781-259f8149e9e9" }, { "CommandList": [ @@ -1819,12 +1864,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "ad82401e-77ee-4a7e-be6d-4ca9a7e1195d" + "ID": "1f81deaa-a935-47d8-9d97-07b303fa6c78" } ] } ], - "ID": "a9b2bcdf-7dc5-4496-874e-3fa17e8d735b" + "ID": "9f5ca34d-6316-4552-a08d-204f0b13a1f1" } ] }, @@ -1841,7 +1886,7 @@ "ReloadData": true } ], - "ID": "25e4a65b-4df1-4194-8900-e4a808a307b0" + "ID": "a7d8f9e8-06cb-439f-b0c5-6527ded11d30" }, { "CommandList": [ @@ -1856,12 +1901,12 @@ "AdvancedSettings": {} } ], - "ID": "f5daa20b-ce0b-4c73-aa20-e2609287d5c7" + "ID": "28127771-bd7f-46bf-890b-e2a876d0f130" } ] } ], - "ID": "5953dc18-7562-482a-bfc3-25c6dda6001c" + "ID": "c239b2be-1eb1-4db3-b0ab-a118ae66cf1c" }, { "CommandList": [ @@ -1876,7 +1921,7 @@ "AdvancedSettings": {} } ], - "ID": "27458014-e349-4dc9-9f2e-1e0e099ae52e" + "ID": "3f2c2146-1bbb-418e-8272-ff236e319b7a" } ] } @@ -2367,4 +2412,4 @@ "Formula": "汇报详情!$B$11" } ] -}//VpV9ymblSpdVdstFKv6NSk/t/UvHtpxryD7fyiJPksG2OyQqmn+t+C3ssABCc6UtVnLyO877BYnPykLBzHQJkpdFv9uSFtBc1cPQ5pZ9wjAwqDmQRIFhpjwC++hYeJ0FIk7g83+ARUeov5tHqwW1r5N1xGTtV8BbMdhZpkj0YlpAw7jC6d/fx6k+97SXrnp0Cl52oz0akB4TNuE/PRMrzTC7w2KoQ9b+FGks0LZGOPIBLspTZdEV3GNlS+Txa/mA0+YS4Kb9nJszlh6wyiKY3qCJHrzN7SDArk7G30kl87lT4X2g0zbN0oCUaBI+m2/1LtfCjM3Q65J7f2apdvltXoUjp81EgD8DDyX73EbFwJ+4BAxDcohnH2dqX9fL85g/apeEeCGQFPE0TnwYoNLaHE14bLNHw2x3j3ZJJ9MWsZ7HHUR9Asp+ImnlOTWnLx2figF4cnlD2ZtRDJab2idbDOaG2Vqua/8ndvkzixGKIeEp/XbrUlCuE6SE9lJ4Q6USQOLfr9RNCJfsqvr2kU3vWX2/d9tNiFdgdxqUBddjmLppQZpnuTDrSIAFvxho3MMCSrVjQnDFkDGQOHUSKlFA1Zuc0gQMLnKRBSiu1/0h0oQb6kP8RcE7bBM8n0n4gmZBKjVBNb/WenPrZ103kv0DprmcEjs8TOKfeT6R48EwNdSpiws8RLjNObKP81huPziJym368ilmKPUkgXBDH+IJrpaOVdALPziRHVwDSBFxYLqObTDZwMMTgttWshiZHYq4FVFT1YZt4bRKBV4VbY3xlgCMDS8BD5QCp2GsTSZWWMqr+FI2V1ilSvS6NA01dSP/nEy7+rEbeCVDa8rISVx4IUMorR4SHkbx5+Qhog65mJgBz7l3fwmD+oM8UFpSgo0jdWNn+ifz3eQXu32Y8IYcow==|920 \ No newline at end of file +}//SkK5DQKw0oLQaq6IfbCyKKe3DGT7IVLKzrNJH4L1ZKZ7af+9ArM87jJK4+DqL0E8hRMdbZ8LgU1K0fYgl7GJd5w/6AROjaS7LiECr0dEccR+jzmx9Y7OE9BZES4fwwaSuBgx2zdanDVYjy1LLqC7CjnKi+n3OUkxLKRIl+hpOtC4G2mTeXO6F7o9UFNfG7pkv1E17r/0sCzR1I/xe//WXo8rVeTT1j1r01pqYFvF3qoMH8dFEsYlU4YvdADGnLOogKR5+sDNh+NJOzgLXXTDKw0/wQVKTYBPIOv0moyiV3vss70insI+DsurzhooxWhb/ZVC7NWzSW7J87eu5DdZxSz8nycgDmfbTmbUUMXRrddf39vVC6RG6l496c2CTLuU0EVFFouJ4XjOP3iYTQqhZhGHqW9QSQ9KN6+DPscKxmc4Q9izPERwFVAdzrqu9vKhROSF+6bIEsOEuuTUvueYChjVes8bX1YZpHXkr/++EB/7BVEEld9Kif1yIrvY1nV6lPyXtdiUjOelCRODcW83wdfvgchrZLvWX9fIGE2qTKuNQ/6DySfyhouzt9i8/0Kl2Oa4+UbEX2B96SFQ7B2af8zSRxk/rqjlPgKIuVyPgUuQB1I5yc6RZhnXE8SlIdRBwiXplwBWG2ZUWaSuyda07iTwrF1kqM2vwJdZQEFcCBr9gdqO8jTKCwSrt0+Sv4uAXTeRuaLYlcbYJ3arn6JXaF+9w28jgTR7htWR1vqDfYtf38geDiJ3B8+TAQKz7SrPnnHgMDANCcvh6tS5QfOu726JuHbd2xdstacLT0Pkbk/BwD6Eh59qOI4C1HfRBFGGY9iK5/oFF5LtyC9NL4xC1XBXZHTXBluia4K9y2reFONA9/hhh7CJmlwSgYGgJb+qMTpcUtIM693FlctXttuYww==|920 \ No newline at end of file