From 7503d586f9947f75e74b801767f7bac6ef0c93d7 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Tue, 27 Aug 2024 18:58:53 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=A2=9E=E5=8A=A0=E6=B1=87?= =?UTF-8?q?=E6=8A=A5=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=97=A5=E6=8A=A5=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=9D=83=E9=99=90","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":1,"Type":1,"Name":"PCPage/=E6=B1=87=E6=8A=A5=E8=AF=A6?= =?UTF-8?q?=E6=83=85"},{"State":1,"Type":1,"Name":"PCPage/=E6=B1=87?= =?UTF-8?q?=E6=8A=A5=E7=AE=A1=E7=90=86"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/FGC=5F=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF"?= =?UTF-8?q?},{"State":1,"Type":31,"Name":"UserControlPage/=E6=B1=87?= =?UTF-8?q?=E6=8A=A5=E5=8D=A1=E7=89=87"},{"State":1,"Type":31,"Name":"User?= =?UTF-8?q?ControlPage/=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF"}],"Version":"?= =?UTF-8?q?v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 60 +-- Pages/汇报/个人日报/汇报详情.json | 619 ++++++++++++++++-------------- Pages/汇报/汇报管理.json | 32 +- UserControlPages/汇报卡片.json | 191 ++++----- UserControlPages/汇报卡片.rd | 4 +- UserControlPages/用户信息.json | 4 +- 6 files changed, 470 insertions(+), 440 deletions(-) diff --git a/.collaboration b/.collaboration index 1db3d6ce..398182eb 100644 --- a/.collaboration +++ b/.collaboration @@ -890,31 +890,11 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-27T18:52:59.5514207+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\个人日报\\汇报详情.json", - "Pages\\汇报\\个人日报\\汇报详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报管理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-27T18:48:56.5793288+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报管理.json", - "Pages\\汇报\\汇报管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/个人中心", @@ -1150,17 +1130,7 @@ }, { "ModuleName": "PCPage/FGC_修改用户信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-27T18:43:05.2225535+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\FGC_修改用户信息.json", - "Pages\\内建页面\\FGC_修改用户信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_重置密码发送邮件成功", @@ -1292,17 +1262,7 @@ }, { "ModuleName": "UserControlPage/汇报卡片", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-27T18:43:47.573222+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\汇报卡片.json", - "UserControlPages\\汇报卡片.rd" - ] + "ModuleType": 31 }, { "ModuleName": "UserControlPage/聊天列表", @@ -2306,16 +2266,6 @@ }, { "ModuleName": "UserControlPage/用户信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-27T18:45:09.1095386+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\用户信息.json", - "UserControlPages\\用户信息.rd" - ] + "ModuleType": 31 } ] \ No newline at end of file diff --git a/Pages/汇报/个人日报/汇报详情.json b/Pages/汇报/个人日报/汇报详情.json index e7bbc74e..9ef25a16 100644 --- a/Pages/汇报/个人日报/汇报详情.json +++ b/Pages/汇报/个人日报/汇报详情.json @@ -266,7 +266,7 @@ ] } ], - "ID": "ead84fed-5cd1-429a-88be-6cd7191b00c7" + "ID": "68da5c95-42b8-434d-97b0-887aa25b6208" }, { "Condition": { @@ -302,7 +302,7 @@ ] } ], - "ID": "1bc133da-a16a-47d3-8274-42d6c9566de5" + "ID": "1b768758-105c-4edf-93ba-18a74774d013" }, { "Condition": { @@ -338,7 +338,7 @@ ] } ], - "ID": "6cabcac6-19ac-4feb-b83a-f8d0f90ae8a3" + "ID": "7717a04f-ce0d-42e7-acf7-47f199807a24" } ] } @@ -637,7 +637,7 @@ "ErrorCode": "0" } ], - "ID": "e7e94bc9-2a3d-41b6-915a-b7e48e79946d" + "ID": "06e3960d-1f81-4557-8a30-291c6a998206" }, { "CommandList": [ @@ -647,7 +647,7 @@ "Message": "必须指定成员" } ], - "ID": "9cda97bd-ac50-444e-97d6-910fa00d2a1e" + "ID": "65d82a95-3856-46b7-a1f7-c2f7d102713b" } ] } @@ -1032,7 +1032,7 @@ "ErrorCode": "0" } ], - "ID": "51ddf082-cf0e-4959-8dad-d3f1295d7e54" + "ID": "af589b3d-6883-44a6-bf97-607f16b37729" }, { "CommandList": [ @@ -1042,7 +1042,7 @@ "Message": "必须指定团队" } ], - "ID": "d921f32f-aaf4-4a36-a613-785a98aae622" + "ID": "b7bc9e8f-6778-4700-a996-32eaa17807fc" } ] } @@ -1173,7 +1173,7 @@ "ErrorCode": "0" } ], - "ID": "a728c7b0-e5a6-41aa-8479-566d5e4eaccd" + "ID": "b88a3e84-b393-4484-aec4-265823802278" }, { "CommandList": [ @@ -1183,7 +1183,7 @@ "Message": "必须指定项目" } ], - "ID": "bbc569ca-c255-4640-86bb-f76b1971e86f" + "ID": "fc819d4e-9136-4130-bccd-988e4b7f50de" } ] } @@ -1322,12 +1322,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "3259d224-2323-403f-b103-4d9a7498e715" + "ID": "446ed060-c107-4672-b684-04bb697d5f0b" } ] } ], - "ID": "06885f63-df1f-4f63-bc3f-419113964d99" + "ID": "d78ceb4f-59e0-45cc-87b4-939dd38410af" } ] }, @@ -1477,7 +1477,7 @@ ] } ], - "ID": "3bb2213d-8170-476f-ad90-bb60e91ebffb" + "ID": "a8b9ebbb-4295-4029-b957-dce9733d604c" }, { "CommandList": [ @@ -1491,12 +1491,12 @@ "Duration": 3000 } ], - "ID": "453d3ece-02d8-483b-9311-6f7cfe76a8ea" + "ID": "a43a7509-2e54-49f6-8e29-b64fc0ddfb1e" } ] } ], - "ID": "1f69765a-3b30-40a4-9417-bb4b3b8e2172" + "ID": "168e3f85-bafa-4f6c-b533-ebaed5e2e2fc" }, { "CommandList": [ @@ -1514,7 +1514,7 @@ "AdvancedSettings": {} } ], - "ID": "9bc129a6-fd8e-4c0c-8946-5d5293e7529e" + "ID": "199011b6-7373-4440-9da9-78d94d35d9ed" } ] } @@ -1543,30 +1543,34 @@ { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=汇报详情!汇报类型" - } - ] + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "76e3957e-3d31-417f-866e-ca79325eda7c" + } }, - "value": "%Null%", - "compareType": 1 + "value": "%CurrentUser.UserName%" }, { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=汇报详情!汇报对象" + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "c1384e2f-eb41-481e-a90f-970b524d31cc", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 8 } - ] + } }, - "value": "%Null%", - "compareType": 1 + "value": "%CurrentUser.UserName%", + "compareType": 10 } - ] + ], + "RelationType": 1 }, "CommandList": [ { @@ -1574,104 +1578,37 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=汇报详情!内容" - } - ] - }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "纯文本", - "ID": "07a88404fb1f4323ad8ba179a674c7df" - }, - { - "$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.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ { - "$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": "=汇报详情!汇报类型" - } + "SerializeProperty": "=汇报详情!汇报类型" } ] }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" + "value": "%Null%", + "compareType": 1 }, - "ID": "145d5284bd164177903e0102725d3579" - }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!汇报对象" + } + ] + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -1682,58 +1619,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": "8d171a6c-e959-4498-bd76-7157ba9c1ed8" - }, - { - "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", @@ -1745,37 +1722,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" }, @@ -1783,120 +1747,216 @@ "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": "141a5ae4-0d6c-475d-978b-5b397829c86d" + "ID": "da4a4f15-7973-4816-8917-e7c71006273d" }, { "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": "136d1286-d9fb-4e4b-9d23-d9d7099509e4" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" + } + ], + "ID": "95920bbc-76d0-492e-b88b-d25c49b408f5" + } + ] } ], - "ID": "ba45713d-4a2e-4156-853d-f4590ae986bf" + "ID": "4af2554d-f22c-454d-9f9a-08d0df1b9f4b" } ] + }, + { + "$type": "ElementUI.Commands.ShowMessage, ElementUI", + "Message": "保存成功！", + "Type": "success", + "Duration": 3000, + "Offset": null, + "Center": true + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true } ], - "ID": "6f2a8408-a46c-41e6-8983-9942c034ff2d" + "ID": "1b81a2e9-fab8-405a-80fd-4d9fddebea58" + }, + { + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": "请填写汇报内容！", + "Type": "warning", + "ConfirmButtonText": "确定", + "CancelButtonText": "取消", + "ShowClose": false, + "AdvancedSettings": {} + } + ], + "ID": "1f360b25-acfe-4611-a75a-f5348bc1a331" } ] - }, - { - "$type": "ElementUI.Commands.ShowMessage, ElementUI", - "Message": "保存成功！", - "Type": "success", - "Duration": 3000, - "Offset": null, - "Center": true - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true } ], - "ID": "1fd3d744-551e-404e-a4e4-1cc2c334bc96" + "ID": "35f3d967-e88b-4953-84c2-e55846e7f001" }, { "CommandList": [ { "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", "Title": "提示", - "Message": "请填写汇报内容！", + "Message": "缺少汇报类型和汇报对象", "Type": "warning", "ConfirmButtonText": "确定", "CancelButtonText": "取消", @@ -1904,27 +1964,22 @@ "AdvancedSettings": {} } ], - "ID": "dc0149d0-1f2f-4c07-9ed1-48ce43e2c6b2" + "ID": "71e55327-277a-43d9-816d-bb430942c72c" } ] } ], - "ID": "ddeaf231-a81b-4f20-9001-e6a9046fa42c" + "ID": "eccd11d2-7554-4706-b308-b5a30a505ef8" }, { "CommandList": [ { - "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", - "Title": "提示", - "Message": "缺少汇报类型和汇报对象", - "Type": "warning", - "ConfirmButtonText": "确定", - "CancelButtonText": "取消", - "ShowClose": false, - "AdvancedSettings": {} + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "您无权限修改该汇报内容" } ], - "ID": "b4676857-1370-4a55-8b7e-c5ad6c4594f8" + "ID": "fe1e94f6-3ce1-4b58-920d-16b06b4b992e" } ] } @@ -2415,4 +2470,4 @@ "Formula": "汇报详情!$B$11" } ] -}//91F5FV3hMTkq+LvNb5NdPXJIl1jdc9PA4ZOtEC17KASSY/jhabJHw7t2pyF21IiQTTTA4TJJHmYHiIqKEB96Jp3cUFY1jCBmyF9Kn2TENwFrkoGxfQPF5KGmTvwEKXPE19V2TnW4T8gPKJpPh+cCzm7MYpQPdAa+q5KMkqucIDSwUvJZ5xAr99TS34k0SkPFVt87H004TEb+merlc46kzjR47ey5Z1/D8FEiw32OI4E4LvCwIo+SV5a56AZB2JDq1+zkVlsk+J0fUG1jt9jpx3s6BuRHQ3eZnSXoZBb+ou3B1h7LS4vNQbonycN1ojK0Bfu0BE4HRfFE/Nl2qP3oq/W66NyYuS/Ivng7R+tFtQKktodbPMvE+ogz5GVR/krBYvu5mJrYv1s3lFqNXqheX6NXJcm6SESzZyNkDsv0o7lwGpGrAEll7MX6F0g2TU7Zj0v53WiPH1vZlh1RoeI7LFncdQMvONxUF/1ntxr6DR/6tQv96GNmabr/OM76bn30lV3R23Oj06d8XlFx8/SYGI9vaPYn0gs/ZlrNqpJ19r5SQ8n92kPuJJ08sLKRc1EpAlUe+XowoTTkB7AbNzzW57TQnJs3W0sZ+U1Tz1EpYERX4ocI9gttYbbT3T7oXb9oYVnOcsRCldTndE7/LG440Hy7W+mV4rqT0RnV4wmzsrh3MDaT7uTKg7tlOXyFaa8QppISOjTKfKVtBeQQ1osgHr68PH3V96sOkc/6YdhsV/bQcgQhprH1O61FeEcm4vX/qstKSeyPO+4IG+zlDOKJ+LMtqwlkgpcbsM0QUepK8YaU6sCJBGrVM45lCecoGIh/cQlOhIqiH718TivYX0ILSVN5SCS2AsZfkAgqnU/z0U3kQBP4Cv4yMYEKmDBbA4KiEoRFCsnjeGzCJgL3zbhvRg==|920 \ No newline at end of file +}//Q4UwQT+OQwUOHWaWpmJ0AW4s/6VMkFgYdE8xqY7JeD6Y5WAnYVO66RmLIH5DeH1S42MkBMEjqLdNUAmeBzG3SJMjDJ86iZwkh8IlYzcWkpCuDSqD10MZlUfrryL3a31Zx5uBUqbwMz94Eie3L7I/ClyulpzIM0KnNicEHGlQ5Vp29jIJrVZ2FFYsXfoXvrCgJwwyZqCg8igHSjunHZfLGue9ibyx/iYlwAlLchpe5Y9PauneQsgvhMu14MUtZ1fviCENSWpuki8Sqet99+nzits20PNtw2vs76yESvBARg31as8oOe1gz4UlYGmUZWUzWZ4gHQqx+sE1tIxEqQoxVjZwkn9S4nWapLn/z85djHjf7omD8BbYWjKU6YP1HJaKcI0t7VvLZjB6BpVexegn4M9tVN9n6R0102oa2HvbYAOxzDs2pLiqxwF7k8nduLoqXetE4T9/3Q+IE7ITO7XWPz+2AJ0FTiwhZpYvhZUsIcqhANNocF2SrWa8KKMEOawIuD142e0xnxVjE2SzJ4eWIqlFiV3wO+Q3OjXywFsgvFOxQB5vjaYsnAWcNleJx4n9HTN+ZS2WO3FzvZic6CGYesqEqBBaZlISV//eQr1e6ZSms+tehE4M4BaluGVbGmWJX/SjcPGOMFBRwKDDmn3aKejbT9V1QZfiUGePMJ3pkQIyW7pjtUWy27fdDPn/KrEY5TxpA93zVGqWgL9xmzQppNm6RUvlqtmbMQzT32bV54cxHNvcbXwGYZV1flGnuKZ3/VqM90vlPx4r/I28W5Y1ccrslvNX6j/VSdp2W9jIiTl5TcT3jOuAB7UsLjhFdZ52HaAEf4no2YRL96UDxrzRyKGqZZVqXF1ciWaMfJ+yuokFcBq6wb+MZEY3z4MNNE6OEezso3E6lt6Mq1YLupEzfw==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报管理.json b/Pages/汇报/汇报管理.json index 734ed450..d1a46e42 100644 --- a/Pages/汇报/汇报管理.json +++ b/Pages/汇报/汇报管理.json @@ -300,7 +300,6 @@ "1,6": "日报", "3,1": "关键字", "5,1": "成员", - "5,4": "%CurrentUser.UserName%", "5,15": "日期", "7,1": "状态", "7,15": "对象", @@ -590,7 +589,7 @@ } } ], - "ID": "af1522f0-e12f-49c7-b766-5b8201e732ad" + "ID": "e6d0cce6-fc1d-4b83-863b-bb02ec60b742" } ] } @@ -785,7 +784,7 @@ } } ], - "ID": "54f16c49-7955-4269-a73e-cc633575d58d" + "ID": "c4fbdbd3-96d7-478d-a29f-49b6c276f351" } ] } @@ -1030,7 +1029,6 @@ ] } ], - "DefaultValue": "%CurrentUser.UserName%", "useBinding": true, "options": [ { @@ -1118,7 +1116,25 @@ "5,17": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", - "CommandList": [], + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报管理!R6" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "=汇报管理!开始日期" + }, + "EndValue": { + "SerializeProperty": "=汇报管理!结束日期" + } + } + } + ], "UIPermissions": [ { "Scope": 2, @@ -1139,6 +1155,10 @@ ] } ], + "DefaultValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(TODAY()-1,\"yyyy-mm-dd\")&\",\"&TEXT(TODAY()-1,\"yyyy-mm-dd\")" + }, "type": "daterange", "placeholder": "选择日期", "startPlaceholder": "开始日期", @@ -1776,4 +1796,4 @@ "Formula": "汇报管理!$R$8" } ] -}//9ZBhywA1sYq6+YHsiICbW+fjXhLjbuXQkKpGpEOMoKDasjcpyQBw7gr5vjJMQ/HoGPV8wO4YGB28zF5DakwMgM+SQj9B/AYfwisplT9Zyl0wsIiRRuGicr2F6TbA40quKHZpY+D/OcJP2eWbVxMd9pP1/t0hY9Op9Y2buq/KmZKw8LfeXD0OAhWnKsqqHq/p8qCETm6ZT/RyQrH4cnVD1LBy3HRG5YPwswbJlhkNRmFKPnZSup1MaGH9XKCaiRP88ZjLy0UyyB+HBf8fvE8exi/oif3tGpCQL6UIDIelcUaYP5H9FNftlxstegbHS7AMwDVjKHee3O8f7LFuE6DHCCaejWLsaG4QA2k+3vz0RsPghvGYdemUTTRUWXneyDCS+lzloM9o6pHboV/uiwK2Wr7z4thxiiXqHcpbErBusQfVymghfDqMtY+ZQI7DnCJ3aJjuqSPbtge86XagAGytkO2NqGwy1SrpwN8rVcquMAz1GY0/tWhxAML1j8u53L3As+Bcrrp6xkF9TeDyPinXt2aJioHgU+6HBLBt+0bZaKEa3BsejzhjptB/wjXUf53nX2szn5FwocpOCXoqRbt+ijsGiKEK7K3gr+rE+sVyuIlpyprohxwx7wzQytnb71Rksxu5c9KeuVifiopmEqMbggsQRnFk9RekdRSeCLldEB5zMk4GgSvD0onG7dPZs25z748V0dcp2s121ApCcmoKQmNmXb8hfRGkM/416uaTnVQVQZH86xUdIAa4tVzT3rmBFDB2OvLNtpCyQnGiv/V+zaW1uUkJq30Lkz12gNvfodp0KZoOnBTwiDUASwRGG3vVJCmbk0jg3S91KnJBaBAgELBh0O5eHBmzeo/1lV3iqwbNfOgCuctsi1pYCiiYJ2ZzecXHiL40eE9s013D/sRHLA==|920 \ No newline at end of file +}//4slwC4y0x/1HZHC/91SCy7jbP5zjNhSjJZb+l2pq0Sh21cguw67id5C/7MnxVLXMKJlU86o8/9wv6DlOd5TF+xuxmuheCPImfTRmyNf3denQnv5vzFMSyd9K381Cl+2c9TaPrPArFvBFluYr4FDKeR9AyaHRFWhL5zS/YcDvNnL5s15+cb0q9X4tf1KB2t8zrFJQnc9NLWOVmsmnaPPSFuX0j/dXBhD5N9E5FbMzRel2qyv+2CGbki1WsptMs02wpVSyUQh4mj485ArWpl+c+ZbZBAf++ndc9oHP1axSAgc25Z0nc+3dgZa3CQ1k2th2mvrWE1Ge+0KE4k8uRPAeRqGkpC2/90BUEx8yGjwLKeq1uYQwRk+ETJq8q/J4nvQZj0clCmjLumX04aXbCReCEOYYuxT/6/T9L6STU5BgePX67dpgrGhb6JMaTrB4P/v1Uf3OFJr2jH+CDA0PgxnVOtCu6cEeNDX4IBYky6imGAs8dr33iyTBT8SCL+iTTuZycZRqBGMRHxLiPUHFMLYVtYnA5TyZHJ4jDwdaOjhNs6W+qeQ9X3I1zuk9RbmE8wUMSakW7rPfJvmw6JgwSTRuHWi6U+UHB6TNtCrlTvtL9apzEya0LSgm2NibyoIUtBTRuxTerv09P+vXnMZ02mMW4ZcOV4N7RYza+xgJVZvAs6Ro3aYXymcMCKLZJOtvbi+pbXnRH+DEVjXsCBFNYedR9GPD/1xhID0TPBDWQJivc5LAq8MJaY7tKfaYebTvM5mC7ZknSDzZpaDpL8mZl5oL5+AqFMZq2uVuYaNjshdxQKNtOpeYahFvSOlFz+5RnuG68Lvq5kJfhDfMCmZjkHOUs+tBQWxvkClymlnXKxfi9K3zCwAtq+TfTLKiu6rOrWu0ub7VSVD/1/gz7IJfTZxcWg==|920 \ No newline at end of file diff --git a/UserControlPages/汇报卡片.json b/UserControlPages/汇报卡片.json index a44466cf..793f58ef 100644 --- a/UserControlPages/汇报卡片.json +++ b/UserControlPages/汇报卡片.json @@ -124,21 +124,26 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 91.0 + "DesignLengthInPixel": 15.0 } }, "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 93.0 + } + }, + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } } }, - "Count": 12, + "Count": 13, "DefaultSize": 32.0 }, "Values": { @@ -146,7 +151,7 @@ "4,1": "内容" }, "Formulas": { - "1,1": "TEXT(C10,\"yyyy年mm月dd日\")&\"：\"&B10&\"小时\"" + "1,1": "TEXT(C10,\"yyyy年mm月dd日\")&F10" }, "AttachInfos": { "1,1": { @@ -154,61 +159,8 @@ "2409c456-15d1-4972-b107-84814b2a3700" ] }, - "1,10": { - "CellType": { - "$type": "ElementUI.Tag, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "ColorList": [ - { - "color": "Accent 1" - }, - { - "color": "Accent 2" - }, - { - "color": "Accent 3" - }, - { - "color": "Accent 4" - }, - { - "color": "Accent 5" - }, - { - "color": "Accent 6" - } - ], - "separator": ",", - "size": "default", - "effect": "light", - "allowAdd": false, - "addButtonSettings": { - "width": 100, - "text": "添加标签" - }, - "ReadOnly": true - }, - "TemplateCellSource": "汇报对象" + "1,11": { + "TemplateCellSource": "工时" }, "4,1": { "CellType": { @@ -230,9 +182,13 @@ "ToolTip": "编辑", "Size": 16, "TemplateKey": "幽灵样式", + "IsInvisible": true, "ImagePath": "编辑.svg", "UseCellForeColor": true - } + }, + "RulesGuidList": [ + "867f3e7f-071d-47fc-8d3b-cd74d212cb88" + ] }, "6,3": { "CellType": { @@ -246,9 +202,13 @@ "ToolTip": "删除", "Size": 16, "TemplateKey": "幽灵样式", + "IsInvisible": true, "ImagePath": "回收站.svg", "UseCellForeColor": true - } + }, + "RulesGuidList": [ + "1d846696-f608-4386-81df-c7930ddf7b03" + ] }, "6,5": { "CellType": { @@ -267,7 +227,7 @@ "UseCellForeColor": true }, "RulesGuidList": [ - "a6a04ac2-31f5-43b9-b82b-0ff605b59deb" + "8a3fc1ad-c306-4c8d-a376-29b0d223f2c7" ] }, "6,7": { @@ -286,11 +246,12 @@ "Name": "用户名", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报卡片!姓名" + "SerializeProperty": "=汇报卡片!用户名" } } ] - } + }, + "TemplateCellSource": "用户名" }, "9,1": { "TemplateCellSource": "工时" @@ -306,34 +267,32 @@ "RulesGuidList": [ "2783013b-5a41-49c7-b5ad-e6016390d1bd" ] + }, + "9,5": { + "TemplateCellSource": "汇报对象" } }, "StyleDatas": { "Styles": [ { "FontFamily": 0, - "FontSize": 14.666666666666666, - "FontWeight": 1 + "FontSize": 16.0 }, { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "HorizontalAlignment": 2 + "FontSize": 16.0, + "Foreground": 1, + "Formatter": 2, + "HorizontalAlignment": 3 }, { "BorderBottom": 0 }, { "FontSize": 13.333333333333332, - "HorizontalAlignment": 4, - "VerticalAlignment": 5, + "HorizontalAlignment": 5, + "VerticalAlignment": 6, "WordWrap": true }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 6 - }, { "FontFamily": 0, "FontSize": 13.333333333333332, @@ -346,7 +305,12 @@ }, { "FontFamily": 0, - "HorizontalAlignment": 2 + "FontSize": 13.333333333333332, + "Foreground": 1 + }, + { + "FontFamily": 0, + "HorizontalAlignment": 3 }, { "FontFamily": 0 @@ -355,7 +319,12 @@ "FontFamily": 0, "FontSize": 12.0, "Foreground": 9, - "HorizontalAlignment": 2 + "HorizontalAlignment": 3 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 3 }, { "FontFamily": 0, @@ -366,26 +335,27 @@ "Types": { "Strs": [ "Body", - "Bold", + "Accent 2 0", + "0\"小时\"", "Right", "Background 1 -15", "Left", "Top", "black", "Accent 5 0", - "Accent 2 0", "Text 1 0", "Text 1 50" ], "Borders": [ { - "Color": 3 + "Color": 4 } ] }, "CellStyles": { "1,1": 0, - "1,10": 1, + "1,10": 0, + "1,11": 1, "2,1": 2, "2,2": 2, "2,3": 2, @@ -396,6 +366,7 @@ "2,8": 2, "2,9": 2, "2,10": 2, + "2,11": 2, "4,1": 3, "6,1": 4, "6,3": 5, @@ -405,20 +376,22 @@ "9,2": 8, "9,3": 8, "9,4": 9, - "10,1": 10, - "10,2": 10, - "10,9": 9 + "9,5": 10, + "10,1": 11, + "10,2": 11, + "10,9": 9, + "10,10": 9 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "4,1,1,10", + "4,1,1,11", "9,1,1,1", "9,2,1,1", - "1,1,1,8", - "6,7,1,4" + "1,1,1,9", + "6,7,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon", @@ -470,9 +443,41 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报卡片!状态=\"草稿\"" + "SerializeProperty": "=AND(汇报卡片!母版_当前用户=汇报卡片!$H$7,汇报卡片!状态=\"草稿\")" + }, + "Priority": 3, + "GUID": "8a3fc1ad-c306-4c8d-a376-29b0d223f2c7", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报卡片!母版_当前用户=汇报卡片!$H$7" }, "Priority": 2, + "GUID": "1d846696-f608-4386-81df-c7930ddf7b03", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报卡片!状态=\"草稿\"" + }, + "Priority": 1, "GUID": "2409c456-15d1-4972-b107-84814b2a3700", "StyleInfo": { "Foreground": "Text 1 50", @@ -484,7 +489,6 @@ "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", "Operator": 3, "Value1": "=\"草稿\"", - "Priority": 1, "GUID": "2783013b-5a41-49c7-b5ad-e6016390d1bd", "StyleInfo": { "Foreground": "Accent 4 0", @@ -496,9 +500,10 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报卡片!状态=\"草稿\"" + "SerializeProperty": "=汇报卡片!母版_当前用户=汇报卡片!$H$7" }, - "GUID": "a6a04ac2-31f5-43b9-b82b-0ff605b59deb", + "Priority": 4, + "GUID": "867f3e7f-071d-47fc-8d3b-cd74d212cb88", "StyleInfo": { "Underline": null, "Strikethrough": null @@ -514,4 +519,4 @@ "PaperSize": {}, "Margin": {} } -}//JZqEnlXe2ReDjdMxnWMHQk4f9U0F49XvYmZs2HiAABx8MUoJLjJ+UcRdF/wqikqCsAq55ka4gIJcyMl1tPu1UokiDBxJzX+LJtH+0WYwLHD/bHh5GgmVt11hvoq8YbdI4+NR9665+ihhy4nFURGkZrvd7T0clkOPmghbweOMwgGpP0YT85SOHo8kmEYruA5iCJF7vjiPFa+iGX1Va1yIn3Ip2HcC2HuM6yTGlUHjF3LmEunwIGq7mL/Q3jbXIbxfkZi64h1DStWTjx7aPyUMxOS8Wp7Xsnyp+fiIV/oO1/68WxMYaCzrLhJnoFNtAtvS60oztPVycUFCIsOm68+ovSo+OkkaChU7djmaTRPlNCOn8VF3sfKAAcNtxaMeVuNv31on2jzccL8Jz0MMhNE4UcemcCe6njzm/ZxIU4FsmglXWIzHu/UyAoKyYRPr/HIYQ54MLULzHT0xnXWdCJy2PNb4x/HKYJB7ccOKnqVAcRaSMhCyty52mpsplvJmSxM+ahp62IIpCuXdNCRpORG/6UAMjkpAMX3OBZ8cUBtwDY7w4w5RdsTyeCHn0tf/og6REBn/0ygPSA9KgZIEiQZPzHOiRGEwFdptzft0ug90VO8Y7ZJRCPjVloqAdKimPkN+K/D1V4lRPePr4Tgt66u84ecceIMs2DTZ3BsH6x00h1dAjiDRdJnCQcLaZnzL7VkYm1NjRXayhVTBfjkIgx6XpLk3/w87EoknQNLyKqGXrcv20/uRIKTHFAsGisZtWOfqqasSSIfVBfP8fp9JmJxq6SlF/bB5xhC9g+FOr3JJq30TuFm5fB2qex7kZAuAwaAVo00db+I4IDdnNsKe4J+G2/+lg5E5dlJwiukobaTXfkpqb+CrryIvGSuXM5uMdj3im0C5GGnbdAgLAVod3vyS2g==|920 \ No newline at end of file +}//kkXMugkQAj0oO7Pfs+/oZ9ZV06avgY+zqWeCPLpdZTlL1NekW5jJQ8CrRck21Y6M4ZG2kKXB4+TjXTP1uFhxHl1k3bjihK7vJIIFb9KkE5JQ3GoWYHNPVgNx/1TqHC9y5U+3Q9/68WRoinomuSXQGZrtGyo43K8sypums7PBpnC0uSH8UyzcxTA2BU94PrBrFkph8S/71maKz5giR/u7WtJBIgaE0Y/cdjq1rWLeQYtl+KmFS0MECgPrTZRGGy7YOXLbNKiFK9FGrjTx2gwyjWPLyOuf6ovC5adgSoNtYyU4dIny59UTpw4+VaYnrp8rtBXWs0yBqvdHR2NO5SiltfCFfC4X7iLzlQQcuNnEYU/bAVj5zr3LNhnlK0zTlbO8KazyQufH4zDlSsebjGEr+q7q7NMCGXKi/NbKfkUmqQL670JON9vph8KjnhNDBlmgRQgHFPNCA94/2Mv2RY2E7BslFf8hoCgQczmfkeHYrCMXm75AhyxCN1RSdZYE68lO7bOeVO/30ub7JGWF7E8JLjWnI9kwtv1AQzqFaVZNDJZdXbOoGe+TvCHWss14grD1YMFd56B4j0p1RZvCiudx7ixWozPfUs+85QV5vX0DaK5RW+p4lj7X/CsFfS3vZgZPPLma3QnQs/44Yeq101Cx0krS8xBvBlDEKSK4lD4dGYv3k8xtufKXpYbzCrkel7YknFKnkhQbk13IS+P29YHiG6js8pxiqrlHP+iaxhvQIFU3aRCdEfUZmiN51BMMBsRUJh7i8WjGrbc9DN2YSIQ8D8z5I6/Y5ZgoWWWwE0Tzsy1tuDIgnf3crHrcPEiRkCAKOfrRR9fch04cKHCIuHZoScsH5r0h0dFGd9oZa2EHFyQW8zdUo470gKfUwuIIqYNt/M1rXuVu3IEcAsD29XqDyg==|920 \ No newline at end of file diff --git a/UserControlPages/汇报卡片.rd b/UserControlPages/汇报卡片.rd index 6b6d7399..242da4e9 100644 --- a/UserControlPages/汇报卡片.rd +++ b/UserControlPages/汇报卡片.rd @@ -1,8 +1,8 @@ { "PageType": 3, - "ColumnCount": 12, + "ColumnCount": 13, "RowCount": 11, "Formulas": { - "1,1": "TEXT(C10,\"yyyy年mm月dd日\")&\"：\"&B10&\"小时\"" + "1,1": "TEXT(C10,\"yyyy年mm月dd日\")&F10" } } \ No newline at end of file diff --git a/UserControlPages/用户信息.json b/UserControlPages/用户信息.json index 0af0942d..c31bca3e 100644 --- a/UserControlPages/用户信息.json +++ b/UserControlPages/用户信息.json @@ -26,7 +26,7 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 20.0 } }, "2": { @@ -113,4 +113,4 @@ "PaperSize": {}, "Margin": {} } -}//ookcplnb0g3bFrMO0CRCe7pt579EtCSMaqpCP8ifRsq8KjU/LY6nV7sq3vyABrFGIrBYOdbMIycXOHT0O4RUXoLJBFJeWTAJOMAePwBAWMjGRKzr5VJ9gEk/ynkODcgXQxgspU7mhzHMi7MolURA8ro4lrkkoC4oxQQusy6/uGGVxNTKxm73HwqbVPYhH5f83R4jJz+qrCICUa0oevHHmUmy+PstyXMDo9I1OuTcjYin7bHwsc67cYv9mbrOX/gHy1EF7u9u1Q3ldKMwgUxD8YmzzPSfcL0UUOdo9h0GSr64JShCt3N7MwEtMAuhuAS2D46Fo4pk1AWycXDbT6+V9329CD5Jj42YhJhvOPK8WQtPNj3utUR949V0r8PM2YdOZgVUL1U7Zi3AVRNAk5CiyOQc442+G+hKQvTUar/1RASuBYHmU3sQXQYKHktzviie21xoHcfzK5K36KEIGNx/S+5jZ2nGIwkRROA0xevRDwWkVz+i2WEA+U7fRQQH9DeOEokGTsbvgBYurP6SN3Nba/k9WmZRH8NSLFkdWIYRGGb+VON1nO2GvGumCbKrh4XWt2M7rZ6KueMGS1ozGi5SOG6iVDIdNFEVhLvSZ1fqB2j4cQ4fLfsDe4xfr2x2Mvgx5MPbzcHiOU+65sEuwrRBBa1R6p8ZG5F108j60qDHum8BRi9WK185C/lYvlX1Eq7meS1IwENGnDis2pA7AVXXWGuHUbvHtgFB4qneLnKtK3/uFxWULfacoINMF82qEfx2JKZycUBSQufXld/gUVgENknx7zOZPbd7DU8fb3eKETeIt7nXodCrqj68quj2Ot8nzzd4g6mX1kC8Tt9vVMwq9L88J5S8awrCkINkcY8H5jccrfLQR6tfe/Z4GxphTcct7ixFaCWfxtjx7w4YhbUpog==|920 \ No newline at end of file +}//MkDcaXAfPSpqFXs5i3YE75fAkkH5JPfBBbejnxOgjct/8LTPVBEQCa+BGO95MC9BFIZgBX8ohOCGNXNjRc2pXWl5b6/8Fi3FJVU3WtX1t7JDIrhy7B7tcrHgGnDEYvgsfrYuElgoNRTya9SddoYmTbm0KOpbCals0QtqSPiwRqsUVqxc2ClOrNzgsDmnc0MIxirjmXGRtcuVQCyXsRaiPaERjmplOPWmE15A6COOmX9R2qVohGOYVCR0vwkWL/4IMO1l4VzWqmAo3yUfwoo+08Hu+TPSJ15K6xsywgcoKnZx5xM1xV2WSWR170OmeVJnPuzzj5SI2Np0ybXjhcu3OG7/+oqv0jtZPi/0J6No4BNNnU6RwlM/+UJ783xCnBSA+tUtA6kXMYIVwAZQHWnNxQddIgivPr5N1skmHLAnvNVznHsbz6eZfrAQwlu7IuWj8t573EK7benWoKK/b6+qATD6hThrR4Lmhhx2C30rMq9Kc5FZ33wQN6/JCiHLs3kJEPFHag4PhtgPNG2RyJmm8NrMvks81YSHoGaHkqsaPmZ/MeOXv7mH6hhPEjdsc6wS2Kr4Ssq86bYtK0UbSPQSzpR0PdjAcDcwapHlm+bvkMfAq79lAHh+yCGRTXLCm7yUKtUpAJ4KLN2p9KyW1nWOLZjksElXZEjN2ofVJLwMzMWRArpHKCJe1snNLZC94VWpP9KthClWVV3grpUxbBvXZzInV8FAuPlRiRJj4q28nPUa9/SmIEiCVtoIV/jsIdD4lFx6O80JWIjagAw3YjOHvvDOVhVzKfmRFyn9kyL5i+3vwNXoBxi0eHAkK0QfdxyqS4OFnWqYMarWqvDf0vCxR6KPP/zdRgHW6mbq8yONM5OsXVXv4k+GRtjM4276EGI39ff7cro8LLmpepyEwYmxnA==|920 \ No newline at end of file