From a939cfe964aa025883457285e19a02582a8f76bf Mon Sep 17 00:00:00 2001
From: cuckooent <phoben@qq.com>
Date: Mon, 25 Nov 2024 12:13:36 +0800
Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?=
 =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E6=B1=87=E6=8A=A5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86"}],"Version":"v1"}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .collaboration           | 12 +-----------
 Pages/汇报/汇报管理.json | 12 +++---------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/.collaboration b/.collaboration
index 59905ba9..e5208014 100644
--- a/.collaboration
+++ b/.collaboration
@@ -782,17 +782,7 @@
   },
   {
     "ModuleName": "PCPage/汇报管理",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-11-25T12:12:44.5614671+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\汇报管理.json",
-      "Pages\\汇报\\汇报管理.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "Pages/内建手机页面",
diff --git a/Pages/汇报/汇报管理.json b/Pages/汇报/汇报管理.json
index 356796bc..1d93fd12 100644
--- a/Pages/汇报/汇报管理.json
+++ b/Pages/汇报/汇报管理.json
@@ -295,7 +295,6 @@
     "5,15": "日期",
     "7,1": "状态",
     "7,15": "对象",
-    "7,17": "个人",
     "9,1": "查询",
     "9,4": "重置",
     "12,1": "个人日报列表"
@@ -592,7 +591,7 @@
                                   "BreakpointIdentity": "fe21a9d4-7f63-4c20-b8ee-92802685f730"
                                 }
                               ],
-                              "ID": "45ba49fe-7e35-4bff-9631-ac0253c54880"
+                              "ID": "bed82bf0-d68a-4bb1-a2cd-03b18c8af9ab"
                             }
                           ],
                           "BreakpointIdentity": "3bde7a6b-4452-4e87-bf23-ff7318d8c72a"
@@ -795,7 +794,7 @@
                                   "BreakpointIdentity": "067210c8-f821-4699-91a4-e50a4454438e"
                                 }
                               ],
-                              "ID": "fefc23b9-b145-4a05-b2d3-3e7291945661"
+                              "ID": "4f15a330-c849-44b2-aa8a-564f676d325c"
                             }
                           ],
                           "BreakpointIdentity": "d924b5c8-ba40-430e-95e3-639c51364e9c"
@@ -1175,10 +1174,6 @@
             ]
           }
         ],
-        "DefaultValue": {
-          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-          "SerializeProperty": "=TEXT(TODAY()-1,\"yyyy-mm-dd\")&\",\"&TEXT(TODAY()-1,\"yyyy-mm-dd\")"
-        },
         "type": "daterange",
         "placeholder": "选择日期",
         "startPlaceholder": "开始日期",
@@ -1220,7 +1215,6 @@
         "Style": 3,
         "PrimaryColor": "Accent 1 0",
         "SecondaryColor": "Background 1 0",
-        "CellDefaultValue": "个人",
         "Items": [
           {
             "Value": "个人",
@@ -1824,4 +1818,4 @@
       "Formula": "汇报管理!$R$8"
     }
   ]
-}//FTZt797rzLDTR4xgFLKjD+3MFw+t1qoCF/GzijW0y3klGaBxrXBrFrUvTt2NaPhbbAhIKSZ7FouBLG+cUBLECcEOKkozkgL8BCkzW8COY3+SKxzokOpNztJMAGJvmTg+x16YZi/SbQb4JJfI0/ztLJjbrQthIai6XJOX3opeRI8fTSgfdTKkTUVrDTHMtGPIHhB/i7onDkGoGaXvkOT6F4xlima6cV3bi+2Oou7qYovrqGuwIR7bI782+YrkuvOTqEnnCmVN3taYSXq+1Fnlp6UnYelYxAEBX15yEfHjMasBNBzlZLx4G1iSfRcgTrq3AHbmRDcD2EiVrAEjdJjmVhP3ZWGXHh+k9bMmTnnJhy+a6kCa31WpoqwYVUonBdgnWKDZJoGjbQ728To2Xz1uXaB4rEpN6e4/VkDuN/fY2M2gubOmrOfB8e26q4fdovnLQUiRWJgJenzoEDykxE1U9LJppJ9QUnTAIupuPDdCSRXwvyy0Ldtr2zLy1mGht/duWQUnzWik2hCv5246qoAAj2GoGFqxda/WWPgPpMLPUbjOarYe3OoJCjwHW8XRqejemXFjj48RnAuKh+FjA0PN9vsBWb7XcriEVBXD3SL8/3QatR6uW4cF9rELnAHa43dl2MlCR5zvRKwWdofW+fwHT5HUl9AeBdeS1+WgdahlW6kH7DxBCCARFK1/OtfM2mADeT9wcOahCfJ2IMSU1YZG2R6I85wnaaGmoCwvO3HldC5KTyIyPYhgS0lirztTGs/8L4YM5Nb0PYQd+ez+hICupV0267j71EosV7u+4EsFqULCW5WaKxVV4zli0n6mX0GTDxgY08xdsNVsOlb0xc0t9xZU/ohoIFOAMfjg9RXvWM1NEQvgv56yYDEcp6Ux6Ijhd6+Pm52SIej6O7prmqoi4A==|920
\ No newline at end of file
+}//uU8cjy29ywozCTYDE/LQpKrQ8hfMrUStjyZdCkf145/tmZH8LqVKZmHIIWsW/U5aCHHLvQ4GB0FYhn2feVUPot5g83+/sYaPaZh9b8P86iv0Hv/qxKYOEm7xsWIKnY7fqrIdEkzWq15ay8lihgER+BQZXy7tbyi2iSpRkqVlgG6KurxDYnKoEzVVIV76F/T0G9JF8omVvmRVzGJVDFagRkU/S9o6ZA0tC4tCTy1o/MUBwXVapS8CYxRe5z4x0mUiKt4xPNQKkx5CUWXEKnBjCY24S2I7u1cqaG4HvjUosTXUULQCI4GK8nAC8JmGjL0XFSd1H1aH0Tsjz3O3isWE0yAjjCwHQltZgW4fAVTvArpoLgEUif7HSQ2jtceoc8tSNRAY4qMERJqE9CshWXk/MVZO3ZBdoyylEk6HufxY+J/CCAg6nMAKZPqVNSVKwX0PBjEYecjO8pWAQsIxi3bD6eZWnKnp1VBekKae0tv6nv3I3EjofEl50+za15L2kAvWbk9xNcZ/9Q8t2GD5hIaHK00l3yvhEAF67LP2PTfG6lJhZNHbekg8oj/QBTJczlPB2q1BAOk6qGzx7hTHZLD1E+ItU462QdfI5wTbNi9CFNjWiNR9lHXBCL6B65BjFr6sl594vYFyH/RmPgWaFhy6lDxDkMNxSF7IF8vJmvRFQk4xgtem8EPd9CWcCTynISdwa8GzrUkvquy9vRFpjZVT4WLo5hVNqwtRZtHQAuADsQsW31EGdQtv/M+2XciV4+fY5mStDaH+sdP7vOTy1GYQrYm+fCgQn1U1VKCMdkkAgEXBvF2kYT+aC4UlzSJU/6wyTePRW/SPnURiyf8JkjoCYLR4BRnbT6s3gmqEuBuJuGfGdblKsXJ4zoIu0WNcT4ehleUWlZGqR1CjNO8Oe005FA==|920
\ No newline at end of file