diff --git a/.collaboration b/.collaboration index 588f40ae..2e399398 100644 --- a/.collaboration +++ b/.collaboration @@ -762,19 +762,7 @@ }, { "ModuleName": "PCPage/汇报列表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-25T10:20:13.846223+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报列表.json", - "Pages\\汇报\\汇报列表.rd", - "Pages\\3609617039444daea57da1978344c4f.json", - "Pages\\3609617039444daea57da1978344c4f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/汇报/汇报模板", @@ -1330,17 +1318,7 @@ }, { "ModuleName": "UserControlPage/汇报卡片", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-25T10:20:21.852347+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\汇报卡片.json", - "UserControlPages\\汇报卡片.rd" - ] + "ModuleType": 31 }, { "ModuleName": "UserControlPage/Git仓库卡片", @@ -1388,16 +1366,7 @@ }, { "ModuleName": "ServerCommand/批量生成日报", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-25T10:23:17.1193756+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\批量生成日报.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/Base根据汇报模板生成内容", @@ -1411,19 +1380,6 @@ "ModuleName": "ServerCommand/修改工作日报", "ModuleType": 15 }, - { - "ModuleName": "ServerCommandPrivate/自动生成昨日日报", - "State": 2, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-25T10:23:17.1193441+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\自动生成昨日日报.json" - ] - }, { "ModuleName": "ServerCommands/Gitee", "ModuleType": 20 @@ -1794,16 +1750,7 @@ }, { "ModuleName": "ServerCommandPrivate/发送日报消息到钉钉", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-25T10:19:03.0191208+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\发送日报消息到钉钉.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/钉钉授权登录", @@ -2607,16 +2554,7 @@ }, { "ModuleName": "ServerCommandPrivate/AI生成项目汇报", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-25T10:14:40.3182526+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\AI生成项目汇报.json" - ] + "ModuleType": 27 }, { "ModuleName": "TaskScheduler/每周生成周报", @@ -2624,16 +2562,7 @@ }, { "ModuleName": "TaskScheduler/每日生成日报", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-25T10:23:17.1193871+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\定时任务\\每日生成日报.json" - ] + "ModuleType": 16 }, { "ModuleName": "ServerCommand/页面_生成项目汇报", @@ -2753,12 +2682,6 @@ }, { "ModuleName": "ServerCommandPrivate/自动生成日报", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-25T10:23:17.1193623+08:00", "ModuleType": 27 } ] \ No newline at end of file diff --git a/Pages/3609617039444daea57da1978344c4f.json b/Pages/3609617039444daea57da1978344c4f.json index 02e22c78..d058ee82 100644 --- a/Pages/3609617039444daea57da1978344c4f.json +++ b/Pages/3609617039444daea57da1978344c4f.json @@ -215,7 +215,7 @@ "Name": "标题", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TEXT('3609617039444daea57da1978344c4f'!D4,\"yyyy年mm月d日\")" + "SerializeProperty": "='3609617039444daea57da1978344c4f'!H5" } }, { @@ -307,6 +307,9 @@ }, "4,5": { "TemplateCellSource": "纯文本内容" + }, + "4,7": { + "TemplateCellSource": "标题" } }, "StyleDatas": { @@ -329,7 +332,8 @@ "3,8,1,2", "4,1,1,2", "4,3,1,2", - "4,5,1,2" + "4,5,1,2", + "4,7,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -339,4 +343,4 @@ "PaperSize": {}, "Margin": {} } -}//3RS8bTimPg24D1a27OLrUY/Me4TuTDv5xhNha71QLFfNq55ee5FpNaA84RaNDqsGQzTu40KgEc8C9yEydlwHKxd2t90ilahFyQ2c78I5X4fzApi7MMwVQepKmq3Otjkn5pCBfqEVShGyKyQNqBrTpaHNduU3GhKCX+ol55SMmIvocPvZNEmq8F5QM2P2ofwG9tDU2LIwjUwv8BYXyBoBz+Od9pUAYcoxLxiWatvJFQg1fp9ejy3TEOPo5mVCe9p2shvmU/Gwfmv+Fs/+gh+oIt0P6DZt7qez6HrhxVwy2/WmF5vaUAx03gW9jBINpR2yd7w06Exu5ZtSwKBXyw4xw3VL0NQkmkfr/TFOQgHsHKqlfuVP2i25svcxABKQVttApYs3eJ2uWZ4WtjeWSkAD5IFl4d+g5emShHZGgB+XnAs2wQGH5Ux7fgK5UlZMgPuRukHjDCESzBl1AxL8TJyrPSD5PJLQWaZ/aiWPzKWaMmhv1c3iPnHJzSlFlnpe9YmMb+AVuHIQjzckJRdBLZB1c14oP5I91mOxabQWhhD9dQRFplcDt98+HetC2+JT0nOPgrGJ9DnbY9ZUh6pC0NRIHmZ9mNgkVb6vdjtHubGfH7Iknbug1cf5ScDSPG95rnM6a1lD12PtrSNaOQoAS6L/5vOTLq/hbHp+S7y/6KfN+p4Mg4Cidme5rF8ABAojDNRpaeT+1Yx1qKt/oW071Gc4yb1ORBbBLy++0hWxMNqVf1TY0uPpa8axH7DUjy82P0WTzSjo0lco8haytKFvR49MgemVjO1vKHY5KyGYumUmMd8i14wxcBV1GInijt+86eB14cxUIiuQdVoUViYi3rknIONGgrLbiS3BdSiDPAw8ij0ImLaAs8Fw4kIcp8RmckZViOPbRlccyE3ei3cQvrkujA==|920 \ No newline at end of file +}//FJOCE4wrRN412YKJi7K4uHMo12v3VcgkkZDpr2nZ1e10CH5F0s8TkEt8jKe1soBvlxE5idujS+s8YFHXuaf3OXPmQ7XxU0AQqWokaS3/+kUs/mUQQ+SlZt0+vZ6mRc47+CG3IlRATMLnNOKJVYg6Ig66YnWe1kgf2zsQquX+FoNI4DFwTqPhtEJNptn6W9fmF4zDnYaicwOoZW0gdi/3BnkbO26+OzfTg1iS4VlD0/jPADIu0iGxPkMZPSK/eKoxVz9mpL9PlH+BMbNS1iyPkJUlyhcCuhq2c94laPeXmosTDyeZG4re8WOJLZoJ7bI/um8c/YtwJ7kFeRNW6GYM3DeJiQ7i4uG8oCQAxMYKBAYjwvTd04ONBhwQeus+/puM+OVccGVhS9EPDi4GXydvIrhIP5xDELQfG9uTOvuB7/GLxSaL0FDawyNIDyKa1JN3OdVwVwYyn5AO2GMktnH1uTGeKxqR2SLYuIPKWAiuDqTapqhunQgaLA8H/1f832Ucs6DxAnpiAJoF79YvL1GTM1KhJxO+SdWMBBMqhyKIcd18S2aWTNVPe3nTQk02rszOew04tNbk74wZZXqx0bMompkykVR9ALMRSrYgDDtgvBCdAr5ddkbVCGVjLhI7ZRgXyKvOeXZ81T/AKZZ0pG1Cna5+2vKARK1pyunDzS2mJ6PvhhWQMtQT3uCRDhQNizlxGaH9r6lnEgb3YxO56xykSdzBJ1w1Gshm2lFJMRgN3orirDrrQ778mciQpRU5RAKzi5RNkg4pdnJbU/lc7vlPd71zUB/NYwtehF56lV0t/6G3bFlNAnlOEkm4VjV/huS5HLTrbd76X0OsQ0HzAp/xcbwgO9uN/Q6EgrxK2gGem2fxr8DGuSUHyK918QniSaHFCvAuv9J70NZjXE+4UPhz6w==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报列表.json b/Pages/汇报/汇报列表.json index 5346c53d..0df9f05b 100644 --- a/Pages/汇报/汇报列表.json +++ b/Pages/汇报/汇报列表.json @@ -262,6 +262,15 @@ }, "ColumnName": "ID" }, + { + "GUID": "e16c44c4-b661-4fb8-9e88-6b6a27d05217", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "标题", + "GUID": "ce07ba34-0714-4006-bb87-9045d74e5aa3" + }, + "ColumnName": "标题" + }, { "GUID": "b44ac180-493c-4664-8272-26421d621883", "BindingInfo": { @@ -455,11 +464,25 @@ ] }, "IsListviewDataSource": true, - "CustomColumns": [] + "CustomColumns": [ + "ID", + "标题", + "开始日期", + "汇报类型", + "汇报对象", + "汇报人姓名", + "汇报人", + "内容", + "总工时", + "状态文本", + "状态", + "纯文本内容" + ] }, "DataSourceListviewName": "图文列表表格1", + "TopCount": 20, "IsLoadOnDemand": true, - "LoadOnDemandCount": 31, + "LoadOnDemandCount": 20, "DisplayMode": 2, "NoItemSetting": { "ImageForNoItem": { @@ -533,4 +556,4 @@ "Formula": "汇报列表!$A$2" } ] -}//sA/34cUB/f5EZkvoDuakW21x7UHBWfG3wQIr0yNAJUKStdoghzUhXDNUreOOhwHhyXm6/siaEQiMG5SQ2UWx1JFSDPo2nol0GC+7B/pjWj7OuN3owKPZkieli+xC4nbsqWK3TV5IaDnY33MfcGXZTQZUjJmFIqq5r2xQA86l2zqnB01oQztcMJNbsXknjOV8nu5Jn5UkMaSwDzEcR7adoOSXQ+QjT21wmfeIv6qAoitGFxkIZRdDrwOK2oMEn2OIw/iBAlFq0UIZMrS6x0sDisgSlU5dIOxeeTW7aDWez8kYsTz8gSpTU7DMJZyytAoeU34C6An1H+JyvSqOb/wYO0O/P2K8lsm0R68+ooD0yA3DgPd3k1PdxuS7O4kEHr53yGKIJWNfNQ8Fxv90rIeU3jRVPxN/EO7gr3jwOCkiEIdGPWRMLCacUEXAnrl7yRHuQqYvkD8IN6sOW7cTwfWl5plF4uuVlSTfGIqaDClaGx7fjztdVx4e+aZcGh5hcBwrx+xcmz3FFxdMUSgYHpFDr1Obp8UQJ8XJl5OwUTiJBKUeLJx+phgupEFV/E1O4NK+TB5bRdT9cDOVg7HciQX1DhPqPwUKB925CsHOce3sfOGQ27kceDzeg4KaGfCA68fPshAmzT24/PfqyWJRzudcvNCtWNL2UJoIhb2WgI//TOnK2340QZC8Mc8jPN0htQsiqhMF5Jy/vr9w+2JS5deSY5/0xREGvs72aDWjVAdtPKsTdfHbjGzHLBA584YAQYiT+bk3VVFExwNVKCJDcDCcbCHndzqUI2pg4t9OsUaAPVdymLTZzxeedjSlv7Fa37syzF4+c/0J6hbHSl8LJfY/xjUAyh7VosQTOE+ibwYdd3GY5KrIb+5TpK48p9QeAPQNkDHWnhvTmX7w4jjxXTYmqQ==|920 \ No newline at end of file +}//Tues0lHYimZgIwMCqnGJpuzu8Le4wjHe0O8K0yuJPa+FkjnY3e7x+vKQt6omC5Hy4tGmHD7ljiEFO4r1aVj7BkRN/o3OK+2D0r18K8LvReYj5n4HDrvwJ+G/OG7yQOPvtnLH8vHbppvAKrtNfZnjOAFSQ83bRUf20MLLHY+AIy6VnrisgYwm8k0bdOCco5SR/mY7UxoQzi4dqK30XQLqoxdV5+jG0TEzzDLkGNjBrVJw51nI3s9C5W2rW1OVeAzdK3iA+f+uzauMQiQdH/RT0IddwrpMRKXOKgFDmNaGUrWlwJC8Qmq5ZHbtWHdY9r3rwLnnGVgmv7jAxPIw5Uuh9Bvf90lurtk48W2eRVkh9ot1AMdaMaFhmZ2LOSMHaQF0CARKaT4DwD87mWtw5D4Emntyy5f+2AdHXCDHLn0ciza/4nhJMUVQ/bOfCsiwuaRWV8vjTgCS3HM/MsKtHuYZpgSezdeoxoJ+cSSYWEQBpl1R6COzaBw+6B0kIkw3oA8wCowB39jQd3sd5f/f9oGTSTngfHAMBHPYqLNnNWuYhOPpCMdkX+2O4zNH7o/ZL9mVaKfSMOv6hZJurXgqHG/xA5j+wWzgtFpBN3f3frG6X20IWN1t8fQE7AzFFRt/PT/Zvbq6S0X7Vc15x6yiU8c5HO9Y1/DoHyrO44lFApzEjoynogjaGmxOo6YLIG8TkS/1Gc51dRpIrL3EirtmLaS3KUgyLGAGrjBvxYbDIXqN6W1/k/DrWVZsECAJuLnEOYNNYMYKrRrSRC6M6J2CiNCaduqlH05vl1OLc8tH//OVxvQihMJDnc+eOab9fBlStdNT5wRbXWvvwbndBsRuZPqGqoBuSpxrBjQK6qbUjJ46aKvDHfMkNWLyn0Vin8qS/ufXy7gKYM1EEFbuMaAkRJipwQ==|920 \ No newline at end of file diff --git a/SchedulerTasks/定时任务/每日生成日报.json b/SchedulerTasks/定时任务/每日生成日报.json index bfc1afdb..89886fff 100644 --- a/SchedulerTasks/定时任务/每日生成日报.json +++ b/SchedulerTasks/定时任务/每日生成日报.json @@ -12,7 +12,7 @@ "Commands": [ { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "自动生成昨日日报", + "ServerCommandName": "自动生成日报", "Parameters": [ { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", diff --git a/ServerCommands/汇报/AI生成项目汇报.json b/ServerCommands/汇报/AI生成项目汇报.json index 2699f558..88dee6a5 100644 --- a/ServerCommands/汇报/AI生成项目汇报.json +++ b/ServerCommands/汇报/AI生成项目汇报.json @@ -149,11 +149,6 @@ "CommandList": { "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ - { - "$type": "UserManagementCommandsV2.GetAdminPortalUrlCommand, UserManagementCommandsV2", - "ResultProperty": "baseUrl", - "BreakpointIdentity": "81b8e934-8d81-42e1-bfaf-1e1fb97093ad" - }, { "$type": "ApplicationServerOperationCommand.GetAppBaseUrlCommand, ApplicationServerOperationCommand", "ParamName": "appName", @@ -164,9 +159,9 @@ "ParameterName": "反馈网址", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=baseUrl&\"/FGC_%E7%BB%B4%E6%8A%A4%E4%B8%AD?ID=\"&项目ID" + "SerializeProperty": "=appName&\"FGC_%E7%BB%B4%E6%8A%A4%E4%B8%AD?ID=\"&项目ID" }, - "ID": "f28eaa9be61e4024916e58bc0a96f224", + "ID": "6c44e8c6713e4d1caa843490b6b180ef", "BreakpointIdentity": "cfb3fe18-fe8a-4ef4-b55b-104cf0070412" }, { @@ -200,7 +195,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "cafd1044-dd92-46f0-98b3-74fbe70fdaf9", + "GUID": "c9d818c0-8c7d-440c-a742-080f7f014b23", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", @@ -211,7 +206,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "3fb4e877-e8c7-4d06-be48-7092629e456a", + "GUID": "c58679fb-be50-4810-bf57-ade82bb69cce", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", @@ -300,7 +295,7 @@ }, "NullFormulaValueQueryPolicy": 2 }, - "ID": "1b15aadaa9e348d5b9344ffb2bab93b7", + "ID": "e845b350188641dc985d4acd6cde4dd2", "BreakpointIdentity": "852dcb83-2877-4a02-b1d5-70071e8d7534" }, { @@ -314,7 +309,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "86c5d8f6-bb46-4d8c-b7f5-06155153bc49", + "GUID": "37db1c1d-9f6e-42cf-9b5f-9ff4b0390702", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", @@ -382,7 +377,7 @@ } } }, - "ID": "666e00a2d648430d9fec453477ab4be4", + "ID": "8bcd947fddd943c1b604e956b7c7b16f", "Disabled": true, "BreakpointIdentity": "c0f60bcd-40d3-433a-9932-c54416129de3" }, @@ -666,7 +661,7 @@ } ] }, - "ID": "d6614b88-5933-4385-986b-78f1621659e3" + "ID": "8c4c8151-53e8-4888-835e-552db509ebdd" } ] }, @@ -717,13 +712,13 @@ }, { "$type": "ContentEditor.ContentEditor, ContentEditor", - "Content": "你是一名优秀的项目经理，你需要定期给客户进行一次项目汇报。\r\n你需要对给出的工作数据进行筛选、分析、总结。\r\n对本次项目撰写“项目[=汇报类型]”，一份专业、易读的项目[=汇报类型]。\r\n给客户好的感受，也能让你获得高额的奖金，请认真对待。", + "Content": "```工作记录\r\n[=参考记录字符串]\r\n```\r\n\r\n### 背景介绍\r\n你是一名优秀的项目经理，你需要定期给客户进行一次项目汇报。\r\n上面`工作记录`为一个JSON对象，是来自于项目的过程中产生的工作数据，请你根据这些内容撰写一篇“项目[=汇报类型]”。\r\n对本次项目撰写“项目[=汇报类型]”，一份专业、易读的项目[=汇报类型]。\r\n给客户好的感受，也能让你获得高额的奖金，请认真对待。\r\n请按照下方汇报模板进行编写：\r\n```汇报模板\r\n[=项目信息.项目名称] [=汇报类型]\r\n[=TEXT(结束日期,\"YYYY-MM-DD\")]\r\n\r\n本[=LEFT(汇报类型,1)]工作\r\n1. xxx;\r\n2. xxx;\r\n\r\n下[=LEFT(汇报类型,1)]计划\r\n1. xxx;\r\n2. xxx;\r\n\r\n重要更新\r\n1.xxx;\r\n2.xxx;\r\n\r\n问题与风险\r\n1.xxx;\r\n2.xxx;\r\n\r\n需协助的工作\r\n1.xxx;\r\n2.xxx;\r\n\r\n----------------------------------\r\n项目经理：[=项目信息.项目经理_全名]\r\n联系邮箱：[=项目信息.项目经理_邮件]\r\n期待大家在项目反馈地址：[=反馈网址] 提出宝贵的建议与反馈。欢迎您的积极参与与贡献。\r\n```\r\n", "Result": "前置提示语", "BreakpointIdentity": "56791a69-c889-45af-b900-66946fe11b5f" }, { "$type": "ContentEditor.ContentEditor, ContentEditor", - "Content": "```引用数据\r\n[=参考记录字符串]\r\n```\r\n### 背景介绍\r\n上面`引用数据`为一个JSON对象，是来自于项目的过程中产生的工作数据，请你根据这些内容撰写一篇“项目[=汇报类型]”。\r\n### 我的需求\r\n1. 你需要根据`引用数据`，进行理解、分析、整理、总结，按照标准模板生成一份“项目[=汇报类型]”；\r\n2. 请根据所属的任务、工作内容特性，正确的进行归类总结，不需要对工时、工作量进行汇报；\r\n3. 下周计划内容，请从引用数据中总结，如果无法从中总结出有用信息，可以写一些通用的文案，表达按计划正常推进工作即可；\r\n4. 如果\"发布日志\"里存在版本更新，请在本次汇报中强调；\r\n\r\n### 回复格式\r\n1. 请不要使用MarkDown语法进行排版，我需要纯文本格式， 但可以合理使用一些符号来区分标题和内容；\r\n2. 请不要回复与周报内容无关的任何内容，包括引导词、解释语、客套语等；\r\n3. 回答风格需要专业、严谨、简洁，不要过于啰嗦和冗长；\r\n4. 下方我给出一个标准模板，请将汇报内容进行填充；\r\n\r\n```标准模板\r\n[=TEXT(结束日期,\"YYYY-MM-DD\")] [=项目信息.项目名称] [=汇报类型]\r\n\r\n本[=LEFT(汇报类型,1)]工作....\r\n下[=LEFT(汇报类型,1)]计划...\r\n重要更新内容...\r\n问题与风险...\r\n\r\n----------------------------------\r\n项目经理：[=项目信息.项目经理_全名]\r\n联系邮箱：[=项目信息.项目经理_邮件]\r\n期待大家在项目反馈地址：[=反馈网址] 提出宝贵的建议与反馈。欢迎您的积极参与与贡献。\r\n```\r\n", + "Content": "### 我的需求\r\n1. 你需要根据`工作记录`，进行理解、分析、整理、总结，按照标准模板生成一份“项目[=汇报类型]”；\r\n2. 请根据所属的任务、工作内容特性，正确的进行归类总结，不需要对工时、工作量进行汇报；\r\n3. 如果模板内要求的某个章节，你无法在\"工作记录\"内找到合适内容，请进行简单说明；\r\n4. 如果\"发布日志\"里存在版本更新，请\"重要更新\"章节中强调；\r\n\r\n### 回复格式\r\n1. 请不要使用MarkDown、HTML等语法进行排版，严格按照汇报模板对工作内容进行填充；\r\n2. 请不要回复与周报内容无关的任何内容，包括引导词、解释语、客套语等；\r\n3. 回答风格需要专业、严谨、简洁，不要过于啰嗦和冗长；", "Result": "聊天内容", "BreakpointIdentity": "a82a0c68-1ddd-4c1c-8c42-cad37e127965" }, @@ -773,7 +768,6 @@ "$type": "OPENAIFORGUNCY.Completions, OPENAIFORGUNCY", "URL": "https://openai.api2d.net", "APIKEY": "fk211858-C6yKrsealBkvHao04yT9Ypg6GR0NVPyh", - "ORGANIZATION": "", "IsDataSource": "json", "MessageJSON": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -785,7 +779,10 @@ "Temperature": 1.0, "TopP": 1.0, "MaxTokens": 3000, - "SystemContent": "你是一个乐于助人的智能助手，请您为我解答我提出的问题。", + "SystemContent": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=前置提示语" + }, "Response_format": "text" }, "Tools": { @@ -820,7 +817,7 @@ } ] }, - "ID": "f00f4935-29a8-4c61-b3b0-043f49bb7b8b" + "ID": "a4e240ac-cf80-47c2-98df-620af4fa76ac" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -844,7 +841,7 @@ } ] }, - "ID": "d73884b0-f956-42aa-b1a9-84c60034aabe" + "ID": "4a33eb0e-acb6-466e-8fbc-39ad008aeeae" } ] }, diff --git a/ServerCommands/汇报/批量生成日报.json b/ServerCommands/汇报/批量生成日报.json index 4d0259a0..a2305dde 100644 --- a/ServerCommands/汇报/批量生成日报.json +++ b/ServerCommands/汇报/批量生成日报.json @@ -93,7 +93,7 @@ }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "自动生成昨日日报", + "ServerCommandName": "自动生成日报", "Parameters": { "$type": "System.Collections.Generic.List`1[[Forguncy.Model.RequestServerCommandParamBase, ServerDesignerCommon]], System.Private.CoreLib", "$values": [ diff --git a/ServerCommands/汇报/自动生成昨日日报.json b/ServerCommands/汇报/自动生成日报.json similarity index 92% rename from ServerCommands/汇报/自动生成昨日日报.json rename to ServerCommands/汇报/自动生成日报.json index 917046b2..774521bc 100644 --- a/ServerCommands/汇报/自动生成昨日日报.json +++ b/ServerCommands/汇报/自动生成日报.json @@ -1,6 +1,6 @@ { "$type": "Forguncy.SaveLoad.ServerCommandSaveData, ServerDesignerCommon", - "Name": "自动生成昨日日报", + "Name": "自动生成日报", "Description": "自动生成昨日工作内容，生成工作日报。", "Enabled": true, "Triggers": { @@ -50,7 +50,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "85effe94-9cc0-4cc6-8de3-65369ca227cc", + "GUID": "ae6b6efa-6f9a-4937-a4c0-115282a860c7", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", @@ -61,7 +61,22 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "4e8aea4f-1c03-4368-ae97-1daffb5fd632", + "GUID": "238a2c22-0582-4d88-92a9-99ab7ee8d114", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "ab0c7f12-5467-49f5-af0e-7c3540fc77b1", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "执行人_全名" + }, + { + "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", + "GUID": "b0bb27c3-5af2-4a4e-928a-0c5470481dad", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", @@ -105,7 +120,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "c41b123f9bae4926822fdc898e98478c", + "ID": "f45f9b600e5e461a86fc8d1948e32c61", "BreakpointIdentity": "f983cf68-fee5-43c2-a46c-54700ef8c7f5" }, { @@ -128,7 +143,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=Item.执行人" }, - "ID": "865f6d298a044de7a819e9c59aa61bfd", + "ID": "3c683bd50a5c4663b564324db4cf3271", "BreakpointIdentity": "d82fecb6-047f-46f5-bfee-875e5a63f531" }, { @@ -265,7 +280,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "ecd908a8-4578-4820-9bae-ea8defe1af66", + "GUID": "00a47899-524e-4f43-869e-2e19522f8f67", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", @@ -332,7 +347,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "4d65dca15f4d4a059b0c73989c40bfa0", + "ID": "99d2682450544a15a1944a9371cdeda3", "BreakpointIdentity": "6228f67a-2cb0-4c80-8d93-cd8d612f4209" }, { @@ -370,7 +385,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", "ColumnName": "汇报类型", - "GUID": "c46d99e0-0924-4aab-b261-4dd849497956" + "GUID": "c1c110a4-84bb-4220-a3ae-ce1ce658f59e" }, "Value": "日报" }, @@ -380,7 +395,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", "ColumnName": "开始日期", - "GUID": "1636542f-6299-4a68-8514-059b747cfa6a" + "GUID": "f3e1d0bd-6276-4851-871a-37b5cdeed99c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -393,7 +408,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", "ColumnName": "汇报人", - "GUID": "2c8584ba-2879-4586-8cfd-25a62e08d620" + "GUID": "4319b6bd-51b6-4850-8773-78455341efd8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -406,7 +421,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", "ColumnName": "内容", - "GUID": "de382c90-6c84-4ef8-b1c8-6995e3f6b64d" + "GUID": "5f78b993-01e8-4880-99dc-b364666ac583" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -419,7 +434,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", "ColumnName": "纯文本内容", - "GUID": "b0ef91c2-b2c5-4c17-9eaa-d162888866af" + "GUID": "60d55d21-5597-4a57-8ce6-04c1cb5021c9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -432,7 +447,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", "ColumnName": "总工时", - "GUID": "37876972-0203-482a-ae55-27c560124b30" + "GUID": "1a5e865c-43d9-4965-8dd5-b91d12507dda" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -445,7 +460,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", "ColumnName": "汇报对象", - "GUID": "c9a7431f-66c5-429f-a124-d4f109e79da0" + "GUID": "abd802ed-730c-4ede-86e8-efadfd32de6b" }, "Value": "个人" }, @@ -455,9 +470,22 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", "ColumnName": "状态", - "GUID": "9babf69c-3573-4934-8ae3-30c0525e12fb" + "GUID": "83b6f0e2-59d5-4443-9bb9-464555b8619c" }, "Value": "1" + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "汇报记录表", + "ColumnName": "标题", + "GUID": "63b1089b-40a3-4555-b254-e9fe8eff4289" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.执行人_全名&TEXT(汇报日期,\"yyyy-mm-dd\")&\"日报\"" + } } ] }, @@ -465,7 +493,7 @@ } ] }, - "ID": "c9e0fe4c-9f3b-4ae2-9728-0db4236264b0" + "ID": "8e47e206-f39e-4378-9761-267da22ca576" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -552,7 +580,7 @@ } ] }, - "ID": "c9d4a048-e7f3-4c24-aa5b-5b7c7c088b77" + "ID": "02fe471c-4be0-461d-8ed3-9fc5a9ff6349" } ] }, @@ -560,7 +588,7 @@ } ] }, - "ID": "6b404dff-c40e-4f3f-8307-1a86307cc500" + "ID": "688d5509-8bd2-4050-880b-bababe64f03c" } ] }, @@ -568,7 +596,7 @@ } ] }, - "ID": "323fa6d8-aaf5-47fc-a56d-2581d976b722" + "ID": "73463e86-8b03-4656-b607-c8414c7fc264" } ] }, @@ -655,5 +683,9 @@ "BreakpointIdentity": "0d06247a-0f3c-42fb-9378-e3d70a25101e" } ] + }, + "ReturnProperties": { + "$type": "System.Collections.Generic.List`1[[Forguncy.SaveLoad.ReturnPropertySaveData, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [] } } \ No newline at end of file diff --git a/ServerCommands/钉钉/发送日报消息到钉钉.json b/ServerCommands/钉钉/发送日报消息到钉钉.json index f496038e..3d9cebfd 100644 --- a/ServerCommands/钉钉/发送日报消息到钉钉.json +++ b/ServerCommands/钉钉/发送日报消息到钉钉.json @@ -48,7 +48,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "3272d199-8e4d-45e1-a6af-fed8e07d22c7", + "GUID": "79ba7397-e70f-42f2-95aa-8c9a89982a43", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", @@ -59,7 +59,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "55103b57-c461-4957-9364-734c1b39cf10", + "GUID": "17e66332-149a-4fe3-92de-50d1a5788e06", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", @@ -70,7 +70,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "866091e5-16bb-4a09-8d8c-7a888cccecfe", + "GUID": "70d03fb4-e81f-4443-bf17-1c213bd75bc3", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", @@ -81,7 +81,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "f1d20dc7-767b-4ec3-a2f0-1eb53d401ad0", + "GUID": "0a6f1ba8-320a-45dc-887a-802146dd2726", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", @@ -92,7 +92,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "dd341c67-991f-46bb-8f7f-786fbddad051", + "GUID": "5bed51fd-e5c8-43dc-ad1f-73ff88ec0de7", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", @@ -103,7 +103,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "0fc4bdde-2b41-4b5a-8c4a-e0b202f7cc72", + "GUID": "c4259a4a-f85e-4277-8f0d-0d77d4df58d0", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", @@ -118,7 +118,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "d8817a2e-ee10-4bed-b86a-ff40db8a53b3", + "GUID": "88c20086-d7b2-46a9-a8c0-d49f08c9ba65", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", @@ -133,7 +133,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "5878ac24-335e-42ce-9223-799f12230ff1", + "GUID": "151df68d-a113-4c92-b63b-1f75795c670f", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", @@ -144,7 +144,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "f1bbadda-9a96-479d-92b0-0aa22c43ab41", + "GUID": "693340fd-c760-4fbd-a86e-cc0079e776cd", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "汇报记录表", @@ -171,7 +171,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "4aae89624f5a4893a0678052c919e646", + "ID": "40ab466216de420284d621dbb104b3ed", "BreakpointIdentity": "b0b5aa20-9587-41d1-a48c-8e82c3f20aca" }, { @@ -207,7 +207,7 @@ } ] }, - "ID": "fca0592f-897c-42ac-96ad-c83c045a4671" + "ID": "7c64e12b-cbdf-4161-ab16-650e151dce44" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -237,7 +237,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "d259b58a-42ec-43dc-8c79-bee2385b4f96", + "GUID": "e4554a35-9b19-407f-ae72-d692b1fd03e9", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目表", @@ -263,7 +263,7 @@ }, "TopCount": "1" }, - "ID": "9fd323dcd9ac485f8f6a4bcc9ea73b95", + "ID": "c0a59b62c85546c5b6dda5a350f96a8b", "BreakpointIdentity": "65aaaea7-278e-489d-979e-ab9e26fd839f" }, { @@ -295,12 +295,12 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目信息.项目名称" }, - "ID": "1f6f4918715a4a138c7bbc76ec4d3246", + "ID": "e2e83f8a90e74b508b354aa05727e22c", "BreakpointIdentity": "e4b56d37-17a2-46ea-9714-6b3c708f32fb" } ] }, - "ID": "2942b46a-0f61-4ce5-bbe3-ae83afc20a5c" + "ID": "4cb58e9f-1c19-4a9d-b9a2-a7b065468c9b" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -314,12 +314,12 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=汇报信息.汇报人&\"发表\"" }, - "ID": "2b8925a0782240189246e412a9f877be", + "ID": "83cacc804a5d4670adb72607e5b8dea1", "BreakpointIdentity": "e4b56d37-17a2-46ea-9714-6b3c708f32fb" } ] }, - "ID": "e46f3417-8b68-4617-834d-924d7f41d120" + "ID": "d3f0599f-3ba2-4ab8-9a5d-97a90e3e188e" } ] }, @@ -327,7 +327,7 @@ } ] }, - "ID": "8cd84b85-a7c7-41e1-9391-756734314585" + "ID": "f8da40d0-4e8b-4995-a2b8-ee5d21a1393f" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -357,7 +357,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "aab92d3e-9e21-4215-8cb2-c2ef60ff0330", + "GUID": "067fc6bf-1692-427e-9423-1546a555d9f5", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "客户表", @@ -383,7 +383,7 @@ }, "TopCount": "1" }, - "ID": "dc0da2a5913942a39a23bc04da0e157a", + "ID": "627564aed5a94e3cb28f7f9c8b7ddb97", "BreakpointIdentity": "65aaaea7-278e-489d-979e-ab9e26fd839f" }, { @@ -415,12 +415,12 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=客户信息.客户名称" }, - "ID": "91099efc26724eaf97fb5d54b76bd16d", + "ID": "4e62637c2bab49fe9334c68745f9910b", "BreakpointIdentity": "c22c17c5-8843-47c7-9fe4-c14b29dd8f33" } ] }, - "ID": "fdd82b9e-d9ba-4a93-b57c-b3070b66f6eb" + "ID": "0230c20c-4266-46e3-8fe4-df663522bf6a" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -434,12 +434,12 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=汇报信息.汇报人&\"发表\"" }, - "ID": "d3e2d3f6fe544815a5084c6bb7805ac9", + "ID": "d6883baa873e44a384f2f5e62a3035a1", "BreakpointIdentity": "0a339396-fc69-4176-9e8c-5829e8c013a3" } ] }, - "ID": "53ac2edd-7065-49b8-b56c-b7bdd6e24594" + "ID": "082a6f50-7c37-4568-9774-7d1e283d280a" } ] }, @@ -447,7 +447,7 @@ } ] }, - "ID": "a661c9b5-242a-456d-b382-b6c233565012" + "ID": "b95f7bdd-b02f-49b8-8b84-790294ee7e03" } ] }, @@ -514,7 +514,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=baseUrl&\"ReportPreview?id=\"&汇报ID" }, - "ID": "3a2c030c6c89443cb76adc952003efba", + "ID": "704934a182ff4a3dbd97624dfd9d4485", "BreakpointIdentity": "e734b62f-1c44-4d25-9a66-5f9f77c5e11d" }, { @@ -570,7 +570,7 @@ } ] }, - "ID": "9853768d-0efd-47e4-9682-8adee56492be" + "ID": "0e72dae6-572e-4e5d-a8d3-75aae4bc032c" } ] }, diff --git a/UserControlPages/汇报卡片.json b/UserControlPages/汇报卡片.json index cec15d64..dfcf7eac 100644 --- a/UserControlPages/汇报卡片.json +++ b/UserControlPages/汇报卡片.json @@ -144,20 +144,20 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "标题文字", "4,1": "内容" }, - "Formulas": { - "1,1": "G10&\"提交的\"&F10" - }, "AttachInfos": { "1,1": { + "TemplateCellSource": "标题", "RulesGuidList": [ "2409c456-15d1-4972-b107-84814b2a3700" ] }, "1,11": { - "TemplateCellSource": "工时" + "TemplateCellSource": "工时", + "RulesGuidList": [ + "2c417978-ef17-4455-b973-939352570f5b" + ] }, "4,1": { "CellType": { @@ -231,6 +231,9 @@ ] }, "6,7": { + "TemplateCellSource": "日期" + }, + "6,11": { "CellType": { "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", "UserControlPageName": "用户信息", @@ -311,6 +314,12 @@ "FontSize": 13.333333333333332, "Foreground": 1 }, + { + "FontSize": 13.333333333333332, + "Foreground": 9, + "Formatter": 10, + "HorizontalAlignment": 3 + }, { "FontFamily": 0, "HorizontalAlignment": 3 @@ -321,7 +330,7 @@ { "FontFamily": 0, "FontSize": 12.0, - "Foreground": 9, + "Foreground": 11, "HorizontalAlignment": 3 }, { @@ -332,7 +341,7 @@ { "FontFamily": 0, "FontSize": 12.0, - "Foreground": 10 + "Foreground": 9 } ], "Types": { @@ -346,8 +355,9 @@ "Top", "black", "Accent 5 0", - "Text 1 0", - "Text 1 50" + "Text 1 50", + "yyyy/m/d", + "Text 1 0" ], "Borders": [ { @@ -375,15 +385,16 @@ "6,3": 5, "6,5": 6, "6,7": 7, - "9,1": 8, - "9,2": 8, - "9,3": 8, - "9,4": 9, - "9,5": 10, - "10,1": 11, - "10,2": 11, - "10,9": 9, - "10,10": 9 + "6,11": 8, + "9,1": 9, + "9,2": 9, + "9,3": 9, + "9,4": 10, + "9,5": 11, + "10,1": 12, + "10,2": 12, + "10,9": 10, + "10,10": 10 }, "SheetStyle": { "FontFamily": 0 @@ -392,9 +403,9 @@ "Spans": [ "9,1,1,1", "9,2,1,1", + "4,1,1,11", "1,1,1,9", - "6,7,1,5", - "4,1,1,11" + "6,7,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon", @@ -442,11 +453,25 @@ "PageLoadedCommandList": [], "ConditionFormatRulesCollection": { "Rules": [ + { + "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon", + "Operator": 3, + "Value1": "=0", + "Priority": 5, + "GUID": "2c417978-ef17-4455-b973-939352570f5b", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": true, + "IsReadOnly": false + }, { "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR(汇报卡片!母版_当前用户=汇报卡片!$H$7,汇报卡片!母版_当前用户=\"administrator\")" + "SerializeProperty": "=OR(汇报卡片!母版_当前用户=汇报卡片!$L$7,汇报卡片!母版_当前用户=\"administrator\")" }, "Priority": 4, "GUID": "867f3e7f-071d-47fc-8d3b-cd74d212cb88", @@ -462,7 +487,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=AND(汇报卡片!母版_当前用户=汇报卡片!$H$7,汇报卡片!状态=\"草稿\")" + "SerializeProperty": "=AND(汇报卡片!母版_当前用户=汇报卡片!$L$7,汇报卡片!状态=\"草稿\")" }, "Priority": 3, "GUID": "8a3fc1ad-c306-4c8d-a376-29b0d223f2c7", @@ -478,7 +503,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR(汇报卡片!母版_当前用户=汇报卡片!$H$7,汇报卡片!母版_当前用户=\"administrator\")" + "SerializeProperty": "=OR(汇报卡片!母版_当前用户=汇报卡片!$L$7,汇报卡片!母版_当前用户=\"administrator\")" }, "Priority": 2, "GUID": "1d846696-f608-4386-81df-c7930ddf7b03", @@ -522,4 +547,4 @@ "PaperSize": {}, "Margin": {} } -}//wDcO33D56xeWYH2dVKphbgbSgw7ZaXPaBAsGR8mEJQqv8Y17AgGKYW1MpsOr4EMUkCJDLbbz9esKscXuXPH3AwRIpGXlCqbPmBrXiGMisiU3gwfKYMQNJt04KEmWirrUESIPbUC899s0gphl1Nzs/LleXYbK83/xXzivpZcjQTtlnkvnu1n0L4nLWk2LaVQjldAUlR6+dAjxToKA6sYV+BCzMRJ4TQCRoJFqTuSN7R/DmuTSsKuXgVM5hEjPKVt98fFMCfsRDhvn2VpWbYa45qrUxPdcAYXvQWAMltLOhoSVxAERnRUWCA5LDJEF/WXki2PFv/3+1Y0uHC7FE4JGTb6pBLh/1vxfbTQn8/XKIEzPD7H3OHm9sz1pZWJ//SCSFc/bcH0lCEU1LVvZpKAMctV5VT5Vba3EIwoY3y9lZNHdLHHmORNjyMVML8+wqyFeFA68Pn4PRr8xGMwPqaTGTec4oaFG+OreSVLg7XhXOMhpmq7p9a4v+s6YHWOvWYwupyZRUQzLlFqi3HyvSerfK7yhrCOqcG8TWZL80zEL4Z+Kr/wPtYhRx0dTeCc77Rk/MmUyF3Iz53+J99RLj8S6S58eURJpUbjtIiKnSL1ec8vvnAv2ABjgBsiq/ZVS/XgDQOAwjRKpMkdEVzw31pzK3q+37uuB9YOAhiQIyGNJNAL4+NVf2P/CKcJGCTFUUXbQMCcBK0tb5CVWXPJiifW2OMapsopitgHnR4guBsEFb27H+Q/rq2pEAk6hhr9dET0ML0Tqgmhm0oj7fH9+BhzYvb7qFcyb/CWZfP+dB5xzq/hejX8Dx5SP6m2XT8UnWs3yXi7tD1DmVv/ebAErz99B+gJ6sQLhd0dyAQ6ZDMQcOPnXlDTkhidN0zlvWmo23HVDUJ2xnHpzHpWTTNUJVhtawA==|920 \ No newline at end of file +}//KKNzkUFZGiHshcB3HXT3hXlBU/hc8C5GliTwNYe5PPJzDv53ggtDQTCt+f2qQzoAycvj03YuXmMrip/ayNHcRF8W82PDmFGY4vxWD1o00yDEsXtG9COnz6t3Xppz8iw4NLmavvNqI3ZnIxZ6hyrE1Z4a9BfhrE6SNmDesnl7dzibTc1x/CDnHmE1o82ASLkrLJBWOkB6WC46aBYxYMJ9Pq0Sz3KiCMSfYRjUyCB4kkQ7XWVKD/jLb1yu6cpglvNzT1I5YdlnWQrBM1qt9AlhudBaCsqEkMcJnmqjYI5B9DoWHUfBaAsPDNXEtd59EiBPI48ptr2y6U8eeq2LqsGRoqMJaUBgx22FP7vi0aSFii/9+iNgK4NG/SiYWex1ylFvhXyXUpbVNKqSJ69Ky0R6ysswWMPy5rTje2TXrz6Z0STXlIN9u4z3k5j4H74ex+8xiWvqYNMQJ1htsvMzRA3IX0fu3jcYA8pyVGy201YLSXhHrYaxjj2eVcI3g0ywW+7Y/WLAgoQLU3kfIwFmCyPPIrkbFgpkN6eYG1bR+vVUAw1uYSOq6dp1krElEOuK4+D7dHTOtuknC9hKhlJUhU5VCbohBbHSXvecvlxE5Jna/2NFolaZdve8iajtMI/EbM0KzADvnQezaB+9x6Yabjw6hVIdfFK3m0mR7+Qq1gS9f+5A0tBrl+ZDvL0e+Yt/tzW00Ew6Jk9MTneOKlXY7Jmsl8WYvMjhrEseq5zc1LPcnT3f+zeDzjsPz4OmBgdQbZ8/86ImArfuP5ngc2Y34CY6kLCMD0rxuqRu1gD+bnC7eCsiFGSDafmaEu5ADt4lwR0hRvC4gUYjjIAJBLcgJHzhvFUXH09RMvr3+UvYY7zAGlXdWLlVwNjforak5WUaZBX1rHLc+fiE2tFbR/xEHuT9nQ==|920 \ No newline at end of file diff --git a/UserControlPages/汇报卡片.rd b/UserControlPages/汇报卡片.rd index d6ddef96..1917ac0b 100644 --- a/UserControlPages/汇报卡片.rd +++ b/UserControlPages/汇报卡片.rd @@ -1,8 +1,5 @@ { "PageType": 3, "ColumnCount": 13, - "RowCount": 11, - "Formulas": { - "1,1": "G10&\"提交的\"&F10" - } + "RowCount": 11 } \ No newline at end of file