From aabdcccef816f12ae882556417c0f8f64c27208f Mon Sep 17 00:00:00 2001 From: "TYFEIKELE\\tyfeikele" Date: Mon, 24 Jun 2024 15:17:57 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BC=98=E5=8C=96=E6=B1=87?= =?UTF-8?q?=E6=8A=A5=E9=80=BB=E8=BE=91","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":1,"Type":1,"Name":"PCPage/=E6=97=A5=E6=8A=A5=E8=AF=A6?= =?UTF-8?q?=E6=83=85"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 12 +---- Pages/汇报/个人日报/日报详情.json | 75 ++++++++++++++++++--------- Pages/汇报/个人日报/日报详情.rd | 84 +++++++++++++++---------------- 3 files changed, 94 insertions(+), 77 deletions(-) diff --git a/.collaboration b/.collaboration index 37f861cc..f159f054 100644 --- a/.collaboration +++ b/.collaboration @@ -1546,17 +1546,7 @@ }, { "ModuleName": "PCPage/日报详情", - "State": 1, - "LockedBy": { - "UserName": "TYFEIKELE\\tyfeikele", - "Email": "example@example.com" - }, - "LockDateTime": "2024-06-24T09:49:24.2042822+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\个人日报\\日报详情.json", - "Pages\\汇报\\个人日报\\日报详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommandPrivate/单日自动生成工作日报", diff --git a/Pages/汇报/个人日报/日报详情.json b/Pages/汇报/个人日报/日报详情.json index 4a143489..798a6854 100644 --- a/Pages/汇报/个人日报/日报详情.json +++ b/Pages/汇报/个人日报/日报详情.json @@ -67,6 +67,11 @@ "DesignLengthInPixel": 30.0 } }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 485.0 + } + }, "15": { "GridRowColumnDefinition": { "DesignLengthInPixel": 11.0, @@ -88,11 +93,6 @@ "DesignLengthInPixel": 39.0, "IsHidden": true } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 485.0 - } } }, "InLogicalVisibleIndexes": [ @@ -272,7 +272,7 @@ ] } ], - "ID": "c8ed0e62-538a-417d-bcc1-88c663e80e68" + "ID": "76ea6c33-0513-43ac-a84f-9c0ac788eb6d" }, { "Condition": { @@ -308,7 +308,7 @@ ] } ], - "ID": "8434ccea-17ca-40ef-aaaf-a96eae3f4191" + "ID": "5839b8c2-4b3a-4eb6-8aaa-eecf843c57af" }, { "Condition": { @@ -344,7 +344,7 @@ ] } ], - "ID": "db304d4b-d92b-453e-93ef-f367a4d84c93" + "ID": "7e1d4569-a71b-41f9-af90-e333ce5d2a3b" } ] } @@ -640,7 +640,7 @@ "ErrorCode": "0" } ], - "ID": "7dad70f8-c2de-44b0-ae24-b296f04aeb51" + "ID": "5db5dc2c-d6a7-4b4e-9017-768184f88f34" }, { "CommandList": [ @@ -650,7 +650,7 @@ "Message": "必须指定成员" } ], - "ID": "10e0a1e8-68d0-40ff-84dc-6310005a46d3" + "ID": "c3aa7202-66bb-418e-9a41-c974a592a473" } ] } @@ -1035,7 +1035,7 @@ "ErrorCode": "0" } ], - "ID": "7a3c9778-1545-49ec-95c7-98e568d09d0a" + "ID": "e638e174-0865-4d65-8a2d-6c3153c6c71f" }, { "CommandList": [ @@ -1045,7 +1045,7 @@ "Message": "必须指定团队" } ], - "ID": "49912ea5-854c-47f5-ba3d-85678f8c2b25" + "ID": "06e0dc20-c984-4b4d-8530-6b9d3cff081e" } ] } @@ -1176,7 +1176,7 @@ "ErrorCode": "0" } ], - "ID": "635395dc-1ccc-45d9-b35d-a524de1c6198" + "ID": "49639e3e-81e9-4a01-8ec3-f48e109a8498" }, { "CommandList": [ @@ -1186,7 +1186,7 @@ "Message": "必须指定项目" } ], - "ID": "c3cda90c-f15e-488b-b7bf-bac5de036966" + "ID": "64f572dd-dec4-4e33-a8a0-8afcc412a8aa" } ] } @@ -1249,6 +1249,25 @@ "value": "confirm" }, "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报详情!工时" + }, + "Value": "%Null%" + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报详情!内容" + }, + "Value": "%Null%" + } + ] + }, { "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", "Cell": { @@ -1272,11 +1291,19 @@ }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "汇报类型" + "ParamName": "汇报类型", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报详情!汇报类型" + } }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "汇报对象" + "ParamName": "汇报对象", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报详情!汇报对象" + } }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", @@ -1365,7 +1392,7 @@ ] } ], - "ID": "d1ac6846-4ce9-4c02-a487-548e1a578937" + "ID": "9ef04c2c-9790-4ad2-b57a-70b2c8de924b" }, { "CommandList": [ @@ -1379,12 +1406,12 @@ "Duration": 3000 } ], - "ID": "5a965e6f-b8e9-4f85-8539-67efbf178f04" + "ID": "86cc4637-0d9d-42ea-b87b-3424d7e115f5" } ] } ], - "ID": "c319a688-bc63-41d6-be2d-a0307645df13" + "ID": "b88b0375-33cf-4cee-a255-018c12247d1f" } ] } @@ -1494,7 +1521,7 @@ ] } ], - "ID": "0904650d-e1e3-4614-b7b4-b0876faf48d2" + "ID": "1253dbc2-ca63-4e31-8e4b-5a2000e92b20" }, { "CommandList": [ @@ -1526,7 +1553,7 @@ ] } ], - "ID": "dc983dec-7e07-4c83-a240-267519c2ead3" + "ID": "24c83a37-ee36-4ea2-8eb1-b6e67577bda3" } ] }, @@ -1543,7 +1570,7 @@ "ReloadData": true } ], - "ID": "c8680a41-37cd-463f-9fa2-fb665d0273e3" + "ID": "47970f7b-4c57-4383-ae8e-ae6572a02028" }, { "CommandList": [ @@ -1558,7 +1585,7 @@ "AdvancedSettings": {} } ], - "ID": "82cfd0ed-637b-4914-8f6a-c9f9203fc8bb" + "ID": "a77e43a3-f913-4061-96eb-ee547df8e64b" } ] } @@ -2049,4 +2076,4 @@ "Formula": "日报详情!$B$11" } ] -}//dZa+q/jz3534rPoKR8l4nm715vqsNWPQmQ1ofslWpJxE4FEGbdhoPCgSpOprukfKUyeCgPtTfvh2Qm7fhPXqBdkHTFTjuzaA0LPjXbmOpG1yEZETkRxqSistlW/rGBiSdC3hN53cHu5keG4KozcJbmuvAjy5NH7J3LQgfSpNwIqFLlhG+8NHG5ULkBXd3s88aKTqdGKxuQPXL98tAt5dLJnnyfVXDgabPRyopjvsi8VI0UNXcF7dIXr6MfCN2Jm/lz7t23AF9x0B97g8O9sz5izn3Eb17i5wiDddDLxtPsab/Q3mxw0jaKllBo6Ds76Sx0mL5H/Ks/vNP3bec+LazONKh89eOMXqIFhHiCPFRLlHcVsy0QMh4z4rZncdVJ8xnQBVK/xGgrpon7EBci3RAMPiiZFqIDbESt1eEdoEoVKFihv4bUUMNvtSKGpkymxzVlg1/06lWsVNx6vM+pIRHxCvYwIX88iraDjCaVns626DVwwcSpVQmKM/0ctJl8sXQAPzIAoijg3fbHPGdOrYS63RAwluKO9R3ThmtbDV5Lfq6GpmJMlSc9WiZM3W0JNqSy2w0oZsm/2MzR3Su909AtgBD4Alyqa9iKyY6uZqTCrI3AP7Ia5PJCt0UTqoaoLGAct4M+DiU5uDrkk66pDWwhUkYpZ7EAS11D2BAnEnZ4r/eyUEOA0jZDuFROihcai5muSMSkchkVWJVixZAlDJi1GPEvh6oCcomwAKYqHSSngJusx00A8hDP943SbcALfx+4+Oudx1nmS8yYCYvjVSLzVo/lyJkr3FInoSw/CX7xzv/Hq65sBJ+JRboNYo/aG3UKHAU2JOJDhwbw74ePmLxbO8xrIUXdXv8vX/rbdcySQtZwlr8qRlU1+xbXj6QnK/EhrFTP32IBC3RdSqHPAOMQ==|920 \ No newline at end of file +}//NbY9DYS7ZIve4JL0tq0rU7gXLjND3fnnuUqg5EbBTC7kbsrXy9MNdg2I8QsfUWDl7yoqwgL1zby+yt3bjEHLusTJtB1axF6z1rmNMqs0MuwCqYHq0NNjlTNngDkPg/u5b7c4W2L53sxYjFiEi+2Xf2cd+30+2Azta3Ugg1fwNAMIraf43YiCd+nUlW6glK1DFaQ80dTZdxUQhR8ked68zrpZqyoBTzqnXZAFxu/1PJpOQh+Oo7VQArXbqs5SpOlEnEztHdv9R/F3b8Uo0UIytq0AU86ybAR5Wcb0GfJwGYLvvn6FWVR9xEQzPhHveIdLPnujVw2yEMElxG/LJ280Zsv9ceOLfkRDqk3ZuEyDONJRg7mnASmWCQ4bYl0PL012B2oGKZmds1Z0Ru0Ja2DPXcQEr9vm7l06Bo3fG2lce0BTI+LjnsHIjban6FWeI0TYM5l4icPEKo0YC7cD0g0gTnI70W38kNEVHrvl+qF46iFWclHk/NmK7L0Eomn6StFBAVBFQqpBi+qz7X1K7BqUVup0WJSPSMg+5kBSP7uWDPdrs5PYVp3M2U3TuW8YRSbbk4o+ASGNhZl0VVejOF6Mekd1vtDwEXv5ntXDvORTR9TqwcyZ2V6MdnSTRe/5i1OkNOYOUIvwhbFJGVnZk/6A+F2/5fxN8/ltnnT/RUms+FaIkwuatcDtznbcEbrbS6nBFln73XNSZ2lnC2hMWIsiEHwR16svtYZnJMoxKIWy9Q449es8bwemNKip2b54HkRrjEYMHcINw7EA95rOMistLjR8B+uxn/Ee/uPq9bFxunWiXOqNguC+VnL0D19LKeS+gT/9+al2Q8HMk9XH+f8N2qoMFTGHJxb0LKspsCfaiR8VbfwAC5HsPTYENgLwFiwQVGr8QPzzMMCrCx8SQ2alBg==|920 \ No newline at end of file diff --git a/Pages/汇报/个人日报/日报详情.rd b/Pages/汇报/个人日报/日报详情.rd index ca8ccbe6..e52ec207 100644 --- a/Pages/汇报/个人日报/日报详情.rd +++ b/Pages/汇报/个人日报/日报详情.rd @@ -1,43 +1,43 @@ -{ - "PageType": 0, - "ColumnCount": 29, - "RowCount": 20, - "Formulas": { - "6,1": "TODAY()-1", - "8,1": "IF(汇报对象=\"个人\",\"成员\",汇报对象)" - }, - "CustomNames": [ - { - "Name": "汇报ID", - "Formula": "日报详情!$B$20" - }, - { - "Name": "汇报类型", - "Formula": "日报详情!$P$4" - }, - { - "Name": "项目ID", - "Formula": "日报详情!$B$12" - }, - { - "Name": "汇报对象", - "Formula": "日报详情!$B$4" - }, - { - "Name": "成员", - "Formula": "日报详情!$B$10" - }, - { - "Name": "工时", - "Formula": "日报详情!$P$7" - }, - { - "Name": "内容", - "Formula": "日报详情!$B$15" - }, - { - "Name": "团队ID", - "Formula": "日报详情!$B$11" - } - ] +{ + "PageType": 0, + "ColumnCount": 29, + "RowCount": 20, + "Formulas": { + "6,1": "TODAY()-1", + "8,1": "IF(汇报对象=\"个人\",\"成员\",汇报对象)" + }, + "CustomNames": [ + { + "Name": "汇报ID", + "Formula": "日报详情!$B$20" + }, + { + "Name": "汇报类型", + "Formula": "日报详情!$P$4" + }, + { + "Name": "项目ID", + "Formula": "日报详情!$B$12" + }, + { + "Name": "汇报对象", + "Formula": "日报详情!$B$4" + }, + { + "Name": "成员", + "Formula": "日报详情!$B$10" + }, + { + "Name": "工时", + "Formula": "日报详情!$P$7" + }, + { + "Name": "内容", + "Formula": "日报详情!$B$15" + }, + { + "Name": "团队ID", + "Formula": "日报详情!$B$11" + } + ] } \ No newline at end of file