From 25042bac8d684df972d77a88838b800bc5ff049f Mon Sep 17 00:00:00 2001 From: cuckooent Date: Wed, 20 Nov 2024 22:45:35 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":7,"Name":"Table/=E6=B1=87=E6=8A=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E6=B1=87=E6=8A=A5=E8=AF=A6=E6=83=85"},{"State":1,"Type":31,"Na?= =?UTF-8?q?me":"UserControlPage/=E6=B1=87=E6=8A=A5=E5=8D=A1=E7=89=87"}],"V?= =?UTF-8?q?ersion":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 35 +--- Pages/汇报/汇报详情.json | 308 ++++++++++++++++++++++++++++----- Tables/汇报/汇报记录表.json | 7 + UserControlPages/汇报卡片.json | 7 +- UserControlPages/汇报卡片.rd | 2 +- 5 files changed, 277 insertions(+), 82 deletions(-) diff --git a/.collaboration b/.collaboration index 3b77ee5c..d9b786b3 100644 --- a/.collaboration +++ b/.collaboration @@ -402,16 +402,7 @@ }, { "ModuleName": "Table/汇报记录表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-20T22:41:06.3991712+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\汇报记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/汇报模板对应表", @@ -763,17 +754,7 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-20T22:41:31.3115232+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报详情.json", - "Pages\\汇报\\汇报详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情预览", @@ -1337,17 +1318,7 @@ }, { "ModuleName": "UserControlPage/汇报卡片", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-20T22:40:06.3198151+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\汇报卡片.json", - "UserControlPages\\汇报卡片.rd" - ] + "ModuleType": 31 }, { "ModuleName": "UserControlPage/Git仓库卡片", diff --git a/Pages/汇报/汇报详情.json b/Pages/汇报/汇报详情.json index d3854a67..da082c38 100644 --- a/Pages/汇报/汇报详情.json +++ b/Pages/汇报/汇报详情.json @@ -293,7 +293,7 @@ "BreakpointIdentity": "1b423154-232f-4880-8205-b66f1e81d008" } ], - "ID": "466537de-2251-4ce3-bfb5-a1104cc0eb59" + "ID": "7b9745e3-19f9-4b2b-90d6-21ca55271175" }, { "Condition": { @@ -351,7 +351,7 @@ "BreakpointIdentity": "1b423154-232f-4880-8205-b66f1e81d008" } ], - "ID": "ac19d19e-f531-49e7-8b26-5d4d9922fff1" + "ID": "ef703401-146a-4fad-9ddf-f2b0035e33ac" }, { "Condition": { @@ -409,7 +409,7 @@ "BreakpointIdentity": "1b423154-232f-4880-8205-b66f1e81d008" } ], - "ID": "a52a8ae8-5910-481e-876a-107d60fe00d2" + "ID": "9f629a14-cd1a-4016-a17e-a898a98e6d5c" }, { "Condition": { @@ -467,7 +467,7 @@ "BreakpointIdentity": "1b423154-232f-4880-8205-b66f1e81d008" } ], - "ID": "fb3a4363-6527-409b-b381-6d30b00609df" + "ID": "be796033-2542-43b4-b380-87d8b186b1a5" } ], "BreakpointIdentity": "f60ae614-da7a-4ae0-8ff9-4da6b1f7654a" @@ -771,7 +771,7 @@ "BreakpointIdentity": "ed16f1a8-8987-43d8-84fc-5afa009c2d25" } ], - "ID": "f8ce66bd-a8d6-4d93-9e9f-fa37601679ab" + "ID": "bd8875aa-0a78-4665-9ae8-808ba604e9c5" }, { "CommandList": [ @@ -782,7 +782,7 @@ "BreakpointIdentity": "1c43d097-9222-463f-bee9-202c545bcf64" } ], - "ID": "72c7b181-df2d-4b17-9b72-bb64672acd35" + "ID": "567ee88b-8b59-413a-b667-14275ef00ead" } ], "BreakpointIdentity": "33c73d7d-8935-4b20-9184-6fd9e6147d7d" @@ -1169,7 +1169,7 @@ "BreakpointIdentity": "f495c16c-da05-4352-b452-addefd4cf952" } ], - "ID": "46d1fd78-da0f-4a83-8cf3-fd8656170fc3" + "ID": "b9881ea0-c9cd-4ee2-b262-c952e0a01acd" }, { "CommandList": [ @@ -1180,7 +1180,7 @@ "BreakpointIdentity": "872ae3bf-19ac-4250-b1fc-928c312ea04b" } ], - "ID": "bac93baa-adf7-484d-b8a4-75ee1cf2f994" + "ID": "ace44f68-f32c-4c2d-af11-32e43a0b1794" } ], "BreakpointIdentity": "cba1093c-44db-41ea-8da3-f59508cd1eb5" @@ -1313,7 +1313,7 @@ "BreakpointIdentity": "7824419c-f986-4a0e-8180-d126e1cec98e" } ], - "ID": "34584c91-f461-47a3-8e11-5fb2e77d2858" + "ID": "c1957136-8abe-4887-9932-1bf7982e66e9" }, { "CommandList": [ @@ -1324,7 +1324,7 @@ "BreakpointIdentity": "3684c83b-0d4c-4286-807c-d0d9f60da354" } ], - "ID": "38df3607-a8a3-4b3f-b989-6f64346f4fce" + "ID": "811f2a23-b3a3-4667-b83b-02f49c2af7ab" } ], "BreakpointIdentity": "0e735ee1-26ce-46d3-bc2a-0fc695259bd3" @@ -1462,7 +1462,7 @@ "BreakpointIdentity": "f5850db3-623a-4719-8799-e3a4b59cac4b" } ], - "ID": "285cd05d-72ed-4390-971d-5ac93fbb5986" + "ID": "5de1f68b-5126-45ee-958b-1ca617c25788" }, { "CommandList": [ @@ -1473,7 +1473,7 @@ "BreakpointIdentity": "470ec1c6-48ec-46c8-8e64-a39b9be7705f" } ], - "ID": "ca637455-792c-4531-a7ab-aa67821b12ad" + "ID": "eab122df-1e8a-4a91-a129-dee177322366" } ], "BreakpointIdentity": "fc8d3f05-267c-430e-a3f3-f8dcf66f1d4a" @@ -1624,13 +1624,13 @@ "BreakpointIdentity": "0ecdbd0e-04c0-4631-93e4-6012c3701dfd" } ], - "ID": "68e1ac77-9aff-426d-ae32-5f812b704a57" + "ID": "9c6566a5-d1e4-4d20-abd8-3efe01415d31" } ], "BreakpointIdentity": "150dbaac-a064-446b-b2a8-0d14507f00a7" } ], - "ID": "b607c496-93bf-4347-8656-be7d7f41e411" + "ID": "c81790af-13f9-4228-9e9f-aedac3d4db49" } ], "BreakpointIdentity": "be174a27-f92d-4a09-9ffe-5e624b776c8c" @@ -1786,7 +1786,7 @@ "BreakpointIdentity": "bc726692-e2ea-46db-a4b0-7356b00c3bce" } ], - "ID": "70c871f2-1f35-49a8-8131-ed25da50cc1b" + "ID": "e9833dfb-efe2-4da5-9987-7e475d163308" }, { "CommandList": [ @@ -1801,13 +1801,13 @@ "BreakpointIdentity": "f46e0326-37f5-4d74-8b06-10920e4400bf" } ], - "ID": "4ba7016e-d1e6-40ff-bdc8-f799d24c97fe" + "ID": "437b5270-8449-4cad-b162-811c6daacfe7" } ], "BreakpointIdentity": "cb2517ef-72f3-488b-935f-310b16253a1f" } ], - "ID": "b20eeaf2-a4d0-4c74-a5f6-e3425dc34c66" + "ID": "34cec809-2646-4bf1-8ad8-1e3e53db56db" }, { "Condition": { @@ -1959,7 +1959,7 @@ "BreakpointIdentity": "01989655-2731-4eba-9998-0d53fd5efd80" } ], - "ID": "26696d65-7ebe-4e3d-b7eb-eac7391cd9fa" + "ID": "20b5b684-e18f-4dfc-b3b5-31a1968a3f92" }, { "CommandList": [ @@ -1974,13 +1974,13 @@ "BreakpointIdentity": "404a5f1a-c783-42cb-91e4-7993bb513f08" } ], - "ID": "f285f562-5009-49dd-9d2c-1a3af70e6027" + "ID": "17264324-796a-402a-a25d-6241c99813d4" } ], "BreakpointIdentity": "dbd01ff4-c038-41a6-a6f9-8080aa35b8a5" } ], - "ID": "8322ed1a-ae51-4aec-8ff4-fcccd08e1654" + "ID": "a4340ac5-92ec-4483-97af-e697b6f82cd6" }, { "CommandList": [ @@ -1996,13 +1996,13 @@ "BreakpointIdentity": "7dcd0cc6-05ea-4cba-a309-7f561dff7f88" } ], - "ID": "86572bab-b69b-4aeb-8a55-e8774f4107bd" + "ID": "930825d4-4cf6-4c8e-b2e8-1b00ffab9f63" } ], "BreakpointIdentity": "ba39010e-7c3e-428b-9c66-3159b778119a" } ], - "ID": "c62a2882-2e0e-43d3-9820-0106ebbc5e21" + "ID": "ac708628-9bff-4628-9939-052e0b5fe484" }, { "CommandList": [ @@ -2021,7 +2021,7 @@ "BreakpointIdentity": "7dcd0cc6-05ea-4cba-a309-7f561dff7f88" } ], - "ID": "374e2b29-38e1-40b3-89f0-21ce4ac12600" + "ID": "63f3772a-ed2e-4ffb-b977-a22eeec5a959" } ], "BreakpointIdentity": "fa2f02ca-4b8f-4b43-9666-738961bec93c" @@ -2204,6 +2204,198 @@ "ID": "c7766de070684dfa8735790fc4e32772", "BreakpointIdentity": "f4a6c98e-7dc0-4159-ad47-8a9ac0cbc725" }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!汇报对象" + } + ] + }, + "value": "个人" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!成员" + }, + "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedText", + "RetrunParamNames": { + "SelectedText": { + "SerializeProperty": "汇报人姓名" + } + }, + "BreakpointIdentity": "7eacbc00-1377-4f05-b9eb-1dfcc5e32f2a" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "标题", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!汇报人姓名&\"的\"&汇报详情!汇报对象&汇报详情!汇报类型" + }, + "ID": "fb4b9d0a9bfe4d759a48807b5eb7cec0", + "BreakpointIdentity": "863e1911-3b7d-4021-94cd-a511999ff2cf" + } + ], + "ID": "ad75bc01-2a78-4724-8793-0f5f250f7179" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!汇报对象" + } + ] + }, + "value": "团队" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "团队信息", + "TableValue": { + "TableName": "组织信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "12d50b64-fd2a-4cbc-a1a8-539ef131027e", + "BindingInfo": { + "TableName": "组织信息视图", + "ColumnName": "组织名", + "GUID": "68eb2e34-9d17-4559-8cbd-0c07bacb9483" + }, + "ColumnName": "组织名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "组织信息视图", + "ColumnName": "组织Id", + "GUID": "d3d66388-67d1-4d34-af42-b32c059f4bda" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!团队ID" + } + } + }, + "ID": "e86aac972318464d83eb2f08c253b77a", + "BreakpointIdentity": "4f4ce71b-df24-433d-9b6a-0d3914badd96" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "标题", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!团队信息.组织名&\"的\"&汇报详情!汇报对象&汇报详情!汇报类型" + }, + "ID": "832a9ff3628b4c069e1804b442b03ff1", + "BreakpointIdentity": "863e1911-3b7d-4021-94cd-a511999ff2cf" + } + ], + "ID": "b221caa9-ea5c-4b9a-b0f4-a5a74fd4ba37" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!汇报对象" + } + ] + }, + "value": "项目" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!项目ID" + }, + "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedText", + "RetrunParamNames": { + "SelectedText": { + "SerializeProperty": "项目名称" + } + }, + "BreakpointIdentity": "7eacbc00-1377-4f05-b9eb-1dfcc5e32f2a" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "标题", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!项目名称&\"的\"&汇报详情!汇报对象&汇报详情!汇报类型" + }, + "ID": "5959cc43ff074488a31f30dcff4ab626", + "BreakpointIdentity": "863e1911-3b7d-4021-94cd-a511999ff2cf" + } + ], + "ID": "dc83072f-fdc5-4acf-a525-9ca16c681f32" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!汇报对象" + } + ] + }, + "value": "客户" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!客户ID" + }, + "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedText", + "RetrunParamNames": { + "SelectedText": { + "SerializeProperty": "客户名称" + } + }, + "BreakpointIdentity": "7eacbc00-1377-4f05-b9eb-1dfcc5e32f2a" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "标题", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!客户名称&\"的\"&汇报详情!汇报对象&汇报详情!汇报类型" + }, + "ID": "7f2582053d284169a0d5847c8e6de0b3", + "BreakpointIdentity": "863e1911-3b7d-4021-94cd-a511999ff2cf" + } + ], + "ID": "f0a27c4f-a1aa-4130-980c-a0d1705d5c19" + } + ], + "BreakpointIdentity": "c706bb38-07ec-4705-9280-9f81c3ec7aea" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -2230,27 +2422,38 @@ { "BindingInfo": { "TableName": "汇报记录表", - "ColumnName": "状态", - "GUID": "78adf3bd-357a-4a45-b2b4-29433d70601a" + "ColumnName": "标题", + "GUID": "888bb34a-e3c2-4af2-9351-0a20b1e69c47" }, - "Value": "1" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!标题" + } }, { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "纯文本内容", - "GUID": "1ae9ed8f-8dd0-403f-9889-ab028920837b" + "GUID": "3f0fad25-97fc-44d7-b521-3f460e6e42df" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=汇报详情!纯文本" } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "状态", + "GUID": "20fe41ec-6448-4c23-809f-3569bf93a819" + }, + "Value": "1" } ], "BreakpointIdentity": "834eed75-7dc4-444b-b636-a953a7c025d0" } ], - "ID": "b27c806d-8dec-43cd-9674-286cb3c56cf5" + "ID": "e3253384-a92d-4bcc-8e52-c1002e66f33d" }, { "CommandList": [ @@ -2326,7 +2529,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "状态", - "GUID": "e850b6fc-c30b-4e7a-a330-05ea9a1e28ff" + "GUID": "4bd38d3b-a1e5-4305-858c-6a2781bb387a" }, "Value": "1" }, @@ -2334,7 +2537,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "纯文本内容", - "GUID": "24b19d3f-b94a-4f55-80f5-a8f290d75295" + "GUID": "0daf017f-a877-4d66-a393-fc93f1aef69b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2345,7 +2548,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报对象", - "GUID": "84b63314-dca8-47be-bfb2-5f3172c7875a" + "GUID": "8a95c1fe-300c-4b45-98af-a633c3541909" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2356,7 +2559,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报类型", - "GUID": "ea36fb12-bd84-440b-b9fd-3d273cbc3db9" + "GUID": "fce3483f-2659-4258-bc46-4ce116892558" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2367,7 +2570,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "开始日期", - "GUID": "0e09e5da-7886-4200-b077-9155f61b7911" + "GUID": "45c18aad-d95d-456b-8d4f-757e6b91d5a9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2378,7 +2581,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报人", - "GUID": "7b63bc9f-8857-43da-ad19-409c128b672a" + "GUID": "4ca2b4a0-6aa9-47f3-adfc-a9961db493c8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2389,7 +2592,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "内容", - "GUID": "8ef96c5a-9bd4-42c5-802b-159a7027dc9e" + "GUID": "174b80ee-e451-448f-9015-53a1f7ed58e0" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -2400,18 +2603,29 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "总工时", - "GUID": "10d648a6-3f93-407a-9c03-10aba0ef6302" + "GUID": "854f26cd-8bd2-40ad-900e-630227b219f1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=汇报详情!工时" } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "标题", + "GUID": "4a9d6579-4d5a-46e9-8eaa-4fa285728a6b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!标题" + } } ], "BreakpointIdentity": "88387dbf-5d84-4f8c-86e8-bd1a77a6182b" } ], - "ID": "d3819a0d-a5ef-42c5-8e55-8d6328d7dec9" + "ID": "a6b0c15f-f157-40e2-90b4-05f993191e8d" }, { "CommandList": [ @@ -2420,13 +2634,13 @@ "BreakpointIdentity": "9968f197-62ca-46db-9adf-0de5adb5339e" } ], - "ID": "cac06fb4-310e-426f-ba27-92ee961f9189" + "ID": "06395257-211a-4535-be91-20a2f277a18b" } ], "BreakpointIdentity": "bb5ee034-6ebe-420a-8d71-441ef7d4eb45" } ], - "ID": "d57060e0-c629-479c-890f-6413cca81b3e" + "ID": "9b628eff-42a3-412c-a17c-251869b41a35" }, { "CommandList": [ @@ -2437,13 +2651,13 @@ "BreakpointIdentity": "c2885230-b01c-4c41-8842-90ef9241d490" } ], - "ID": "ef8995a8-ba08-478f-872c-679d3ed2a65d" + "ID": "25f95fe4-f695-4798-8069-5281aac913de" } ], "BreakpointIdentity": "d7ef6cc5-04c2-4531-9609-718169c3fb3b" } ], - "ID": "0d957c16-bee2-4f88-80a5-e29da8702a13" + "ID": "b97ed693-0884-4845-b6a0-8ed2bb6ee728" } ], "BreakpointIdentity": "a9e4af49-8203-4f00-91bb-f5f0e5f53cb8" @@ -2463,7 +2677,7 @@ "BreakpointIdentity": "26c32013-f929-4c1d-a15e-d74c3e95c2df" } ], - "ID": "39351a02-e885-4d1c-b2e4-f0127bf80c0f" + "ID": "57abd35d-6226-4cf0-88fb-d80d7fa50cda" }, { "CommandList": [ @@ -2479,13 +2693,13 @@ "BreakpointIdentity": "da6934c4-f141-47d0-96b1-bf826b38e67e" } ], - "ID": "945f1d8a-7893-4415-a681-4f3e1dde5485" + "ID": "7a15749d-f210-44bb-880e-31e8a21a431d" } ], "BreakpointIdentity": "a00a3d93-7bb4-4511-ba6a-024497e618e6" } ], - "ID": "ce0cfa43-83f4-4c85-a896-a4f1f7320c5f" + "ID": "3884ea3f-e8cd-4c04-a2bd-ba9e697ff7ec" }, { "CommandList": [ @@ -2501,7 +2715,7 @@ "BreakpointIdentity": "608dc433-636a-43b2-a48f-da759c294880" } ], - "ID": "794ece75-59ec-447b-aaf1-63e9f65de890" + "ID": "5b75b1a6-2ad3-439e-b134-c981c5d890a8" } ], "BreakpointIdentity": "51a81760-a97f-415b-88fd-e43ba18c8c10" @@ -2577,7 +2791,7 @@ "BreakpointIdentity": "a6205caa-a069-4ca5-8d7c-0eb519024e61" } ], - "ID": "0b422165-1371-4d5e-a1b8-4964c5febe18" + "ID": "46bb40f2-b9c8-4823-8f8a-0d60e5cb6f30" } ], "BreakpointIdentity": "4eb021a2-5310-40dc-b013-b66e8be0229e" @@ -3094,4 +3308,4 @@ "Formula": "汇报详情!$B$13" } ] -}//dEa5I9WMTgIYc5/CZiBLRyO66+hHakTGQka6J44B1qLu/5tdY2AREhB2mYblp4URh1DX9rmg3f4Fz4SL/w9jesZuW7jnDodUwtDuwYRfN2/Oog+DWneX21Ct7CDAT5neN1ijdkcAjwCp3R0RxLMRW2kCaeSADn6dRNRA/evMq/dVLIhlLCSqDIjDDTavvkGja5icn1ru139UoxfPEBRgDbm8r+8Pi8D20QJBxmldmuFXhnkvA3SNW1E1qC44bYg2DJNgO/6X3u4SkPA1Qa4aU8lvn7mMwOAND58GRvYx00WIbbm7MEv9n7j81rxwNqSguTCwNGiYyusO25xqXZkCRgwV5yhTtmyL1gJUlt4n/iyJnbnuQmOqCWxtjzMpowUG3ZeCnqA3o9wv0T2I1DKdMRm/IqmpFfxa2d5BY806xSDvvMtY2apTgrXKYDUTBZ0swmMNwOe5ZxN9WDJnpVTEkbBEqjTsDFshpMJfpswSPQZV8Ho4yIt9Fe86As3s00T5p0Y85vyYPfWVJnU6opdyP9bkB8aNAmZ2gZj21Q1i/KfkQz14PpGMInuXF/9VXmRYPCjxHl3kFmIiJajBEgSbyM4izP5hCKG+orH4/i3Q/7Z4l8rCWUP9XnEPh71F+GDhRojbkJSw9hBI3jF0zA+ZeJ+fY7/5JmMsdvr5In4RBlBoIo5GwqtO38DY7EpznunD8ULTazPxmf5kM+SQHycgkR5Bf81WipBh2iWEEzgVALAB5aT35Ua1g+SQ7djgAl5gnwvRBzSqKkBvs3JRIoQ8vD7vutKigdLI3hk3zShmgb6Wq2JUUuCkI7nuPKU9bVxeJiu3ubvdSpqtCQQZlchbQfUcbneVZJxi0NgWgFkJoo+yG2B4BzZoL8N2n33h/tXnmxi0+6/TIvfk7XzF69t6Tg==|920 \ No newline at end of file +}//g95s46YTjq5GeVoZ2mFOLhCu9OA8SgtXP5WnJr+UyowTWv6E6prtQOGbyaAAGG2mWs9rGHT1vQhYbCLp7bP9t+7FzWHpEt48BVzwnZmx9ZNchrWTZmL/HUZVVsZKORJd9rALTzCl9DjqMdgo8cKwtZVOiA9lNtfbAvlWP1C9qnpVGrQpF2hUxxmUYpoFNsAC0+/802mcZpFKBrR/z8UswZ73Zb/3jSnpsrAQGlxGIvJmSi+gP36HbtPggYSzsLlYY9ZbzSrxzuxc0ROggIKY2nkg3ZCbSBfgD/hoKwRsZAWm4pPAIet2YpgekNTntRUcOYBzh3RnqsC8RZnO3LI26QI/Fmb6tjShb1XJdsFlj4gcUR81heZTsyeD+s4s05UTl+UxgnaCEHjQOqyd3yo4BYnAOuU8hWk3af86r2a28n9PN6kvmdgKG1nh+nlaUf9E2Y0D3tRvck8pja4SbajzImBgxgb/5qQVfFgSoESmmuUHBicgaBusWIyIQa/hW/b0qAoVUGXdeLm8jPGXN72E1lL67TLxVcLBFHVut/EyNlBuS5uHF/58UTrac9SGWS+F1wwHCzi5y7QAXOju6GL/Yp8B1YKd93CLlVvY+mEomdUz2YdcD9OXZkPQUG0jRZ8DgUlSY41jC2UjwXAkRv9b0/XrBoZtwajfnB4zNxYyXz3C9AGS9yTNXSpGkMMf+VIPIyA71wss1fGP1KKl4uDhOObCO08XCvmAb4dm7eFsZSkcNV2QvH0/O61GOJTgiEMfvC14clib0Ey5+YGYsTY2AJCTN2yiCFpdtVUSilHaofpcUDOSkxsuGZ2WDFn34nJ4jZkNh/xSDc1HBevokwUAvax1yIKm2g0hlTBsyT3WbjojVpStbfCwQ3HRtuR4hIl3cKPl+UsDjV+QoqGGMezcww==|920 \ No newline at end of file diff --git a/Tables/汇报/汇报记录表.json b/Tables/汇报/汇报记录表.json index d895c161..86b77c4b 100644 --- a/Tables/汇报/汇报记录表.json +++ b/Tables/汇报/汇报记录表.json @@ -218,6 +218,13 @@ "Name": "汇报人", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "标题", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", diff --git a/UserControlPages/汇报卡片.json b/UserControlPages/汇报卡片.json index 80b3cd5d..cec15d64 100644 --- a/UserControlPages/汇报卡片.json +++ b/UserControlPages/汇报卡片.json @@ -148,7 +148,7 @@ "4,1": "内容" }, "Formulas": { - "1,1": "TEXT(C10,\"yyyy年mm月dd日\")&F10" + "1,1": "G10&\"提交的\"&F10" }, "AttachInfos": { "1,1": { @@ -270,6 +270,9 @@ }, "9,5": { "TemplateCellSource": "汇报对象" + }, + "9,6": { + "TemplateCellSource": "姓名" } }, "StyleDatas": { @@ -519,4 +522,4 @@ "PaperSize": {}, "Margin": {} } -}//cEJr/WtLa6yFi5zTz3eNCJnxa3hYbfsrx9r83AqgcR+5222TjKsUUimTS5ovLgBVqXJFWmtMqqeeyDrpHi3/jzxPCQ0fCOJWBqnOQq7rXWc9rSU/LF/ICNSyj/0MGrQbDmkiMtvfd/jblQIMkFkorAz7C+QUy+glx9OLhS1PJxAucWwIf94tZrT7vTaW86LvjA+pAFJ7LfjjhX6CtwgW5cAex7xWlo2RstvnRWOYinN1ivblUDxJFsFbQEg0zsy9uYzpSfyZLlLm4SXSFpoqjhd/s/Ubeugk0sYsc9hGio1iU7C+j2NYGmDUebYC3jk3GE2drtaCzTtuM3X86FaDKEpbqF4fhGCmKsGmPllY+91VJGf44KZMtjMCAkcfs7w2xufLy8DcdjBEonsoTiEUMcm0aTl8MY5dfAm+o1r5cbtW4qDpQHZn0TkxMbAfNtmAagakPsxlarRf7s0NTU46Ie9aLkJSs15hweJHLtiz2Ev+y5qGZqYksklGITq5z5np2p92nIdlA//Sb2aUZP7TuTMLLtTQROyw6g8KGO3qxRGRiHIcCDr8ygDr3hz2i0ls1wBW0I2oq0/r6pnA2Kfh3MZ+/hnfv9R3zYvNRiMWjoe5AXGplsp6uGRiPSccVSBZUD8UjjQjoxkVi/agqyUHS9oUo7fbupgQZ4zYjfou0Ttj9iVk75Hykuc9AE1+XjrAjXpA366NPTeCXGisHNbxlHmkDeClD7SKm8v0hDCK/AzJtcnn3oa1IKeJWRolHM9xrcwuxJEU8pqolkmTdV9LnfvXowhzExhPHZyW14lx62xScHafH0gsZIrYF6iB/qFf8bKkzNvPfZVCNnDaCLXHkV37FDehJriGvxq2Q6deR2BqallwZBN5RMx4CxgYjaPrgleh44v6wVWN7/NhbRjjbw==|920 \ No newline at end of file +}//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 diff --git a/UserControlPages/汇报卡片.rd b/UserControlPages/汇报卡片.rd index 242da4e9..d6ddef96 100644 --- a/UserControlPages/汇报卡片.rd +++ b/UserControlPages/汇报卡片.rd @@ -3,6 +3,6 @@ "ColumnCount": 13, "RowCount": 11, "Formulas": { - "1,1": "TEXT(C10,\"yyyy年mm月dd日\")&F10" + "1,1": "G10&\"提交的\"&F10" } } \ No newline at end of file