diff --git a/.collaboration b/.collaboration index aad89759..f7f32586 100644 --- a/.collaboration +++ b/.collaboration @@ -1480,16 +1480,7 @@ }, { "ModuleName": "ServerCommand/根据汇报模板生成内容", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-27T10:39:16.2520501+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\根据汇报模板生成内容.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/单日自动生成工作日报", @@ -1777,17 +1768,7 @@ }, { "ModuleName": "PCPage/汇报对应关系设置", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-27T10:31:01.9197657+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\系统\\平台设置\\汇报对应关系设置.json", - "Pages\\系统\\平台设置\\汇报对应关系设置.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Image/英文浅色.png", @@ -2099,17 +2080,7 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-27T10:21:50.4259372+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\个人日报\\汇报详情.json", - "Pages\\汇报\\个人日报\\汇报详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报列表", diff --git a/Pages/汇报/个人日报/汇报详情.json b/Pages/汇报/个人日报/汇报详情.json index 6f2af5fe..ca119732 100644 --- a/Pages/汇报/个人日报/汇报详情.json +++ b/Pages/汇报/个人日报/汇报详情.json @@ -266,7 +266,7 @@ ] } ], - "ID": "4e15fc28-f895-4676-9e18-1225b2438862" + "ID": "b2611038-0252-41e3-87c0-ea9b93e172b0" }, { "Condition": { @@ -302,7 +302,7 @@ ] } ], - "ID": "87318262-7636-4591-9d4b-aa27818442c5" + "ID": "7cb1d836-a5c0-4abc-be46-a2142de96e6f" }, { "Condition": { @@ -338,7 +338,7 @@ ] } ], - "ID": "b53c03d9-fa1e-470e-8484-398ec0d16ddc" + "ID": "1a83ba64-3824-4a74-8b7a-471f737b20af" } ] } @@ -637,7 +637,7 @@ "ErrorCode": "0" } ], - "ID": "49ae3608-768c-44c2-8f91-ec53223a1c25" + "ID": "611960c9-7026-4d46-a27f-d6b0d6823d54" }, { "CommandList": [ @@ -647,7 +647,7 @@ "Message": "必须指定成员" } ], - "ID": "af937fff-2e98-4250-9733-e3c5e1a95887" + "ID": "44800c85-b39e-46ad-8a7c-a6c7b1509add" } ] } @@ -1032,7 +1032,7 @@ "ErrorCode": "0" } ], - "ID": "7bc3fa65-34ae-467f-a925-84fdbb583713" + "ID": "19885718-23c5-4f24-b3a8-9bb444ec5a18" }, { "CommandList": [ @@ -1042,7 +1042,7 @@ "Message": "必须指定团队" } ], - "ID": "1e4bf32e-9e8f-4e2c-bfb1-8e6acb31cc3a" + "ID": "14872953-c6f8-4b2d-84c6-b1239b174327" } ] } @@ -1173,7 +1173,7 @@ "ErrorCode": "0" } ], - "ID": "d3a1ee3e-97bf-419c-9420-4e9e4b470432" + "ID": "76e46eca-36d6-465d-8ea2-ea8572448a69" }, { "CommandList": [ @@ -1183,7 +1183,7 @@ "Message": "必须指定项目" } ], - "ID": "42fbe9e7-f300-4124-9fd4-ed750b38e4de" + "ID": "582d6db7-1aeb-41d1-b655-5e55d1c626f1" } ] } @@ -1211,140 +1211,58 @@ "FGC_Anonymous" ] } - ] + ], + "WaterMark": "请输入汇报内容" } }, "16,19": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "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": "=汇报详情!汇报对象" + } + ] + }, + "value": "个人" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!汇报类型" + } + ] + }, + "value": "日报" + } + ] }, "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", @@ -1356,11 +1274,11 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=code" + "SerializeProperty": "=汇报详情!结果" } ] }, - "value": "0" + "value": "confirm" }, "CommandList": [ { @@ -1369,46 +1287,186 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!P7" + "SerializeProperty": "=汇报详情!工时" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!总工时" - } + "Value": "%Null%" }, { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!B15" + "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": "=汇报详情!生成内容" + "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": "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": "ea0baef8-691c-4591-a9b3-09d15729bb67" - }, - { - "CommandList": [ - { - "$type": "ElementUI.Commands.ShowMessage, ElementUI", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!msg" - }, - "Type": "info", - "Duration": 3000 - } - ], - "ID": "186002bc-b62b-4a85-8bb0-933d414e8a63" + "ID": "e7d91df6-2861-4fb8-bd6b-fe70ffbd493a" } ] } ], - "ID": "a94a1c43-44ce-4432-8bc7-d203697aa50f" + "ID": "2c3919ff-4aab-4e28-a84b-86964f7facf4" + }, + { + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"暂不支持【\"&汇报详情!汇报对象&汇报详情!汇报类型&\"】自动生成内容！请手动输入汇报内容。\"" + }, + "Type": "warning", + "ConfirmButtonText": "确定", + "CancelButtonText": "取消", + "ShowClose": false, + "AdvancedSettings": {} + } + ], + "ID": "053c82d2-89d3-4726-95b9-abb6b01364af" } ] } @@ -1463,91 +1521,6 @@ ] }, "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "纯文本", - "ID": "8f62514c6ab5460cad9de276a6a4f115" - }, - { - "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", - "JavaScript": "function getTextFromHTML(htmlString) {\r\n var parser = new DOMParser();\r\n var doc = parser.parseFromString(htmlString, 'text/html');\r\n return doc.body.textContent || \"\";\r\n}\r\n\r\n// 示例使用\r\nvar htmlString =Forguncy.Page.getCell(\"内容\").getValue();\r\nvar text = getTextFromHTML(htmlString);\r\nForguncy.CommandHelper.setVariableValue(\"纯文本\", text);\r\n", - "ID": "864bbf0f206a478aa364a99645400ed5" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "检测重复", - "TableValue": { - "TableName": "汇报记录表", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "b49bd534-6438-48f2-8f7c-e6fa076fbaab", - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "ID", - "GUID": "b14b57e2-77d7-4189-8452-20d764baff42" - }, - "ColumnName": "ID" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "开始日期", - "GUID": "c47355c0-a112-46e7-9b42-02c0455f2898" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!B7" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "汇报人", - "GUID": "728c003f-ea98-4cb0-96dd-67b9da6cab2a" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!成员" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "汇报对象", - "GUID": "139ad227-439a-4158-87c8-9f10b2b71734" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!汇报对象" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "汇报类型", - "GUID": "8c152da2-cc05-4832-b6a4-bc3579597afc" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!汇报类型" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "0290fea6734445c3b87c2080d66ff111" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -1558,58 +1531,98 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=汇报详情!检测重复" + "SerializeProperty": "=汇报详情!内容" } ] }, - "value": "%Null%" + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "汇报记录表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "状态", - "GUID": "789d417b-1691-4625-aa80-bd3eed14b165" - }, - "Value": "1" - }, - { - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "纯文本内容", - "GUID": "b7187877-d77f-4fc9-af18-3c8b49a69be4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!纯文本" - } - } - ] - } - ], - "ID": "5470e79a-d649-465d-b346-138147ec498e" - }, - { - "CommandList": [ + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "纯文本", + "ID": "07a88404fb1f4323ad8ba179a674c7df" + }, { - "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", - "Title": "提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TEXT(汇报详情!B7,\"yyyy-mm-dd\")&\"已经存在\"&汇报详情!汇报类型&\"，是否要更新该日报？\"" + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "function getTextFromHTML(htmlString) {\r\n var parser = new DOMParser();\r\n var doc = parser.parseFromString(htmlString, 'text/html');\r\n return doc.body.textContent || \"\";\r\n}\r\n\r\n// 示例使用\r\nvar htmlString =Forguncy.Page.getCell(\"内容\").getValue();\r\nvar text = getTextFromHTML(htmlString);\r\nForguncy.CommandHelper.setVariableValue(\"纯文本\", text);\r\n", + "ID": "864bbf0f206a478aa364a99645400ed5" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "检测重复", + "TableValue": { + "TableName": "汇报记录表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "92600e26-98b7-4702-9228-6e8767ea8498", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "b14b57e2-77d7-4189-8452-20d764baff42" + }, + "ColumnName": "ID" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "开始日期", + "GUID": "c47355c0-a112-46e7-9b42-02c0455f2898" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!B7" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "728c003f-ea98-4cb0-96dd-67b9da6cab2a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!成员" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报对象", + "GUID": "139ad227-439a-4158-87c8-9f10b2b71734" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!汇报对象" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报类型", + "GUID": "8c152da2-cc05-4832-b6a4-bc3579597afc" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!汇报类型" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" }, - "Type": "warning", - "ConfirmButtonText": "更新", - "ShowCancelButton": true, - "CancelButtonText": "取消", - "DialogResult": "按钮结果", - "AdvancedSettings": {} + "ID": "145d5284bd164177903e0102725d3579" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -1621,37 +1634,24 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=汇报详情!按钮结果" + "SerializeProperty": "=汇报详情!检测重复" } ] }, - "value": "confirm" + "value": "%Null%" }, "CommandList": [ { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "汇报记录表", + "UpdateType": "add", "ShowConfirm": false, - "CheckDataValidation": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "ID", - "GUID": "ca53eef7-c8e3-431b-9244-c456552adc95" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!检测重复.ID" - } - }, "UpdateBindingValues": [ { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "状态", - "GUID": "d84f0adf-0f67-4a6e-9d6c-dd786cd8af9d" + "GUID": "789d417b-1691-4625-aa80-bd3eed14b165" }, "Value": "1" }, @@ -1659,140 +1659,209 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "纯文本内容", - "GUID": "d315a2f1-b9ce-4857-8be8-80ca3d9227cd" + "GUID": "b7187877-d77f-4fc9-af18-3c8b49a69be4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=汇报详情!纯文本" } - }, - { - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "汇报对象", - "GUID": "84025290-2cfa-464a-b47d-99f7519e2387" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!汇报对象" - } - }, - { - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "汇报类型", - "GUID": "3de98fe5-5785-4ea6-98a4-27304ec028b3" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!汇报类型" - } - }, - { - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "开始日期", - "GUID": "3c003a4c-261c-489d-94f1-e016d2f56ce4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!B7" - } - }, - { - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "汇报人", - "GUID": "85d506b3-ca9a-465e-b5e9-876c46ef92ea" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!成员" - } - }, - { - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "内容", - "GUID": "16f847eb-9f4c-4b5b-ad86-9f19ef06bc3c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!内容" - } - }, - { - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "总工时", - "GUID": "e2f6537b-31e6-4b37-87dd-dfd237516e38" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!工时" - } } ] } ], - "ID": "63a44da6-e689-4ea7-b78c-a2b445a776ee" + "ID": "03f2ab58-8f79-483a-8bcd-c2413c037844" }, { "CommandList": [ { - "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(汇报详情!B7,\"yyyy-mm-dd\")&\"已经存在\"&汇报详情!汇报类型&\"，是否要更新该日报？\"" + }, + "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" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报记录表", + "ShowConfirm": false, + "CheckDataValidation": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "ca53eef7-c8e3-431b-9244-c456552adc95" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!检测重复.ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "状态", + "GUID": "d84f0adf-0f67-4a6e-9d6c-dd786cd8af9d" + }, + "Value": "1" + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "纯文本内容", + "GUID": "d315a2f1-b9ce-4857-8be8-80ca3d9227cd" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!纯文本" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报对象", + "GUID": "84025290-2cfa-464a-b47d-99f7519e2387" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!汇报对象" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报类型", + "GUID": "3de98fe5-5785-4ea6-98a4-27304ec028b3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!汇报类型" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "开始日期", + "GUID": "3c003a4c-261c-489d-94f1-e016d2f56ce4" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!B7" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "85d506b3-ca9a-465e-b5e9-876c46ef92ea" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!成员" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "内容", + "GUID": "16f847eb-9f4c-4b5b-ad86-9f19ef06bc3c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!内容" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "总工时", + "GUID": "e2f6537b-31e6-4b37-87dd-dfd237516e38" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!工时" + } + } + ] + } + ], + "ID": "f21c9b9e-dc42-44a7-a46f-e59c38f42f1b" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" + } + ], + "ID": "ad82401e-77ee-4a7e-be6d-4ca9a7e1195d" + } + ] } ], - "ID": "b00a0c7a-d1a8-4552-8cc9-c4f4bfd58777" - } - ] - } - ], - "ID": "0f782f21-deda-4f46-aef0-13f225b2d8b9" - } - ] - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=汇报详情!汇报ID" + "ID": "a9b2bcdf-7dc5-4496-874e-3fa17e8d735b" } ] }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [], - "ID": "fbc43417-7ea0-4764-8b71-77674c94ce57" + { + "$type": "ElementUI.Commands.ShowMessage, ElementUI", + "Message": "保存成功！", + "Type": "success", + "Duration": 3000, + "Offset": null, + "Center": true + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "25e4a65b-4df1-4194-8900-e4a808a307b0" }, { - "CommandList": [], - "ID": "5dd4c94f-8f7f-4fb7-b0b8-af7bd6fc4939" + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": "请填写汇报内容！", + "Type": "warning", + "ConfirmButtonText": "确定", + "CancelButtonText": "取消", + "ShowClose": false, + "AdvancedSettings": {} + } + ], + "ID": "f5daa20b-ce0b-4c73-aa20-e2609287d5c7" } - ], - "Disabled": true - }, - { - "$type": "ElementUI.Commands.ShowMessage, ElementUI", - "Message": "保存成功！", - "Type": "success", - "Duration": 3000, - "Offset": null, - "Center": true - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true + ] } ], - "ID": "cee4efd5-3ab8-49b7-be54-df034638c9f2" + "ID": "5953dc18-7562-482a-bfc3-25c6dda6001c" }, { "CommandList": [ @@ -1807,7 +1876,7 @@ "AdvancedSettings": {} } ], - "ID": "28a7e8fb-7cd1-4c63-996c-24a449d7af84" + "ID": "27458014-e349-4dc9-9f2e-1e0e099ae52e" } ] } @@ -2298,4 +2367,4 @@ "Formula": "汇报详情!$B$11" } ] -}//9/7R/j8eyixNw00yO0bzU0X36PELOxoUDYF+l6gY3tQP1fO/oilHGc7Snsd3o+D5sHhzAauQ/yYSM0HnnV2sKfF/jKSoi943DFvKRa4oVIJS9N39d52q86OvNEneiP2Mkfar/m9N+BafgYRjXSSuvOaTM2VE8YbcM4ZxJMC6aX1/JQay6+ucxdvsPKbGKMr5yLkVYF3OxrgUlYGnJ4xsXLiCty8x77Bge+YRUTHuFiuIXvlhvNqeNkj0jHml7NbVQrrRToLwc95Xma4ky1jugy+2FZ1VP9iYR2uvPm44eUPt0FttQSUuc9pqZlEYQW2VCj6xe9j+XF0yTLv6UGDaAihiAohuwb4VfaFiTqLR+42PDSLjxUKqNW6M82tSAtsreVGq5AeXidbDC/jh0AoiZ01z+z+Ywvs4Y5eB5rd79I8aq+vo3CaJqScPd8AMN0OV2CY6BmYQpXVPFxep1yCSKFrR+CPGpUwCVqX757RjF5occnw/bSXPm0QJO7H3jjy75AMvmyH4Tfoz/qaTCrd/g7oyGSqfuqB3B51d00BuMlMlZrMsacgEct8GzZWtv81WHvMwTHLk1SBR2atdqFB42aFnpBrP4jDLvCa3usBauB5d/TN2NlqzlrTyetPSiQLPWM6v5wb+E+Np7wG8sa7eHIdAv5YIrqJLoct/BnMuRn/4lJOETj07Fvoe4KP0GlYN0Q3oF5/f1nGb42RThcnLf9ROuPXZ94cvt1VRDrvWezds/VlaFIxYDgQsTeth8wZ8x5xrhx35uoKkZs+NKblmJl7hd4fHm9AMXK1BkyHxs+1CGzAcMSf+POwRtRr682ihUzLcD2gTI1uttUd/XNa161xJ+gj/mTiWRV2AyZ09fa6Tyzp4vgZIL8hp4C3dR/mHXIP+10NmOdSMMeq3fr0ESw==|920 \ No newline at end of file +}//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 diff --git a/Pages/系统/平台设置/汇报对应关系设置.json b/Pages/系统/平台设置/汇报对应关系设置.json index 44723d7d..9c29b75b 100644 --- a/Pages/系统/平台设置/汇报对应关系设置.json +++ b/Pages/系统/平台设置/汇报对应关系设置.json @@ -56,16 +56,16 @@ "DesignLengthInPixel": 35.0 } }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } } }, "InLogicalVisibleIndexes": [ @@ -400,7 +400,7 @@ }, "NullFormulaValueQueryPolicy": 2 }, - "ID": "5bfbba7a300f447ca4c92f0c4d2eab3f" + "ID": "75cc6c46bb3a42b09c819118163a4358" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -443,7 +443,7 @@ "ShowConfirm": false } ], - "ID": "8ce8493b-7ac4-4413-8a34-29391e20be88" + "ID": "f77bf76f-8188-4ceb-b984-26cb2d1d0a6c" }, { "CommandList": [ @@ -453,7 +453,7 @@ "ShowConfirm": false } ], - "ID": "c54eb69e-c5a1-4603-9354-c44072451a3e" + "ID": "30af1112-4c8e-415d-b0f7-72f05e3d8ec3" } ] }, @@ -462,10 +462,11 @@ "Message": "保存成功" }, { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true } ], - "ID": "9980323c-9510-47e9-9fdf-166b1253b303" + "ID": "221b16df-c267-4445-8e2b-1b81aa59139f" }, { "CommandList": [ @@ -475,7 +476,7 @@ "Message": "模板关系已存在，无法重复添加！" } ], - "ID": "322b8aa5-bed7-49b1-b137-a3bebedc335a" + "ID": "78bbc7ce-8c31-4b64-9993-fae4ba1b3e7a" } ] } @@ -603,4 +604,4 @@ "Formula": "汇报对应关系设置!$B$13" } ] -}//wypTMr1/crRNJ60O0y20uK/Ku9665wygdCbFpPLt1zJBIuMXg+q0EOXT518Ik1GBDkmn/fKfG/WVY+VJR0iWV+BgZGURkkO9Dff1vkW3iW6C4hCqcmNYWiFhs6Ft7uTXNEJA+ocLWNzfNFFAbORIr8UfAJDULPjTuAVhqJX855VRjP8k79crectPgu08Pl8fzepl6y+zqi/7X+Uiz2PCOQ9S29g+tWXBwmkh55ayFUiT5LHupb9hRBNXWDMKBTCWTDyjcU6UW0bSeJYKfxJB526EZHOrkTw2PahFuACd8XZaNspCxAweRniNG0eDX1X/RGfmNIiyalxlvpmEEZeMFWYRHZ93XFuhsHkWx6xLPge7hXpUAq+oSoa4wQTBKn1zu8JkTFnkJ9m0KSInYWERhVnte+NGv52Q2DBUGzoA8TYB8MwLAQix/urKRHI3oFXY+ftKWpL4XxIQ4zqJILAjHANuecJChaUg7crdnXlL2kkRSrqiGzt4ckIS+xTVOTGu++4bV/37G+oJYbSu3h1CB9GZexFfoOx5LrR1gvQpknDg3pdvKD3wt4t/JI2aOuUCU3DuLBZH+oKvp+V6o8DZFrCw8Ezqcsml1u1pdeBOvl88k6dg1UQEG9h4N8mrMS1bdFUJAp0pX0Q9S2viRBP7RFId6NNV09TzXSZDhiqIctXUWF/wu7KyiVHG1lPeqbFul4VSqXHG5wXXWP23PYBURrAZ3ds6Kw1BlnJSPqBDCAunaTRNSySmePcisx3OmN2vhi56xURcLgVjk0bM4w6ohOcnXH15px5CPHV0pKPlmUrQRFufd89GL56qyp2Z2zYFEb7FPFbL79oTPPXCeRr3JSEEFPDMdgsQCR2gWDL95U/ApGLZhqdRldibHKINQdDqEX8wRRZu5AlCq/05LrU9fQ==|920 \ No newline at end of file +}//QqzbxmmLWP2/s+U7p/S0+ZVwh5qyQQeDopiF/s2kgZUgnutxTqSBi44zUIQbO9T5aEWiE5HwJo0/PbGdI+QEMPnnv2uoKgevqO7HQuQRaWVANkuaY3EcRDWj7v92l1Ai8KHCHz5E6Tatc4C6bUVxjkFhroEe8qSP25QPiHSjrE6jrVhbqK85Z+lAoZBUJ4TNJjBfzaULhC8Uv1cWUSkkE/LJkNwgZvIxihzM0g0EBtKVWnVdlYSp2x1Mu/Eac+a2eQswCQ29wd3+YJMWETXtVyfMRB4LGP3YxkIl0CoH8QGFx6Vgdz4zQJkhJXVgUmUXB1tpuJKuBy5xmNDiufKcFvZQiKp2vo6W8IQnbWb0TwGVMoV/wPk1276rQoKWldatrHSUgbAg172a4yqfjs4moeJDRZNsPVaHYVsbcp5N5u8fTr+4LLugat3aIIte4J4cB+N0eqq0npBDo3/Pj0w9UXoAJxB694MExh965u3uUyqSayWbXSgPfVTfXRVdFG4igmsFN0lh9KALy7sxKRvQJD1HJHu+E/eDUiljtOIwNMyCTZ2DOo8dXFl/tTJVeHSoiz+O9fyPWNroaZz+DwKubBYXNsnUUmJxetmqRg6trgzCqBxhpNou7ig3TBCrtDYdbXx+PJYE4Ne3JeG33AW4JI1ieXKQ6xJ/QSBLH1M20uVXbZngb3UAQryPAlRYZ402Tuw2PVEoQqW8Ylo1cdwqlnM+EMzUM6TyiXjR5IpDNb+oiCSrc0CUba+80eEke8UbN+NW6wVyWn9bJQ5SKK/C9oT76hM9L7xOZeKNotG376GWSYxQl5Xit6uoIYKBNJafn4AANB7Iv/iGzQ4eHerw3s9OkjzRK3LwRFYjzXzANE+a7woeY0t4L+QQVDHNLAL/PA5A+m5mDGclssDycmn46A==|920 \ No newline at end of file diff --git a/Pages/系统/平台设置/汇报对应关系设置.rd b/Pages/系统/平台设置/汇报对应关系设置.rd index 5ff145b0..27a8525c 100644 --- a/Pages/系统/平台设置/汇报对应关系设置.rd +++ b/Pages/系统/平台设置/汇报对应关系设置.rd @@ -1,11 +1,11 @@ -{ - "PageType": 0, - "ColumnCount": 12, - "RowCount": 13, - "CustomNames": [ - { - "Name": "ID", - "Formula": "汇报对应关系设置!$B$13" - } - ] +{ + "PageType": 0, + "ColumnCount": 12, + "RowCount": 13, + "CustomNames": [ + { + "Name": "ID", + "Formula": "汇报对应关系设置!$B$13" + } + ] } \ No newline at end of file diff --git a/ServerCommands/汇报/根据汇报模板生成内容.json b/ServerCommands/汇报/根据汇报模板生成内容.json index f02aee57..e47cc66a 100644 --- a/ServerCommands/汇报/根据汇报模板生成内容.json +++ b/ServerCommands/汇报/根据汇报模板生成内容.json @@ -502,7 +502,7 @@ ] } ], - "ID": "7600f268-9488-46aa-aa01-b1c341053864" + "ID": "c83b73e6-d306-41c2-ad94-95bd824fd7cb" }, { "CommandList": [ @@ -520,12 +520,12 @@ ] } ], - "ID": "fffe1a31-4063-43f7-a617-156b6f8f24e3" + "ID": "dc9fa5a5-f814-4365-afd4-85ba0250f4b0" } ] } ], - "ID": "861ce463-c1f6-4bce-88cb-85fb65fbb6bb" + "ID": "78b27be0-19ee-45a7-9213-27c8c676595e" }, { "CommandList": [ @@ -546,7 +546,7 @@ ] } ], - "ID": "9b613c6d-592d-4558-b7e8-782acc3f7a46" + "ID": "60e3ded4-c701-4038-8101-fd7b62d3016d" } ] }