From 6cba1da91348e8713ff946a623c2b2a29b786b0b Mon Sep 17 00:00:00 2001
From: cuckooent <phoben@qq.com>
Date: Sat, 31 Aug 2024 16:25:20 +0800
Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?=
 =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88"},{"State":1,"Type":1,"Name":"PCPage/=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1"}],"Version":"v1"?=
 =?UTF-8?q?}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .collaboration                                | 24 ++-----------------
 Pages/工时/人员工时统计.json                  | 10 ++++----
 .../项目首页/项目首页-容器页面/项目反馈.json  |  3 +--
 3 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/.collaboration b/.collaboration
index f2d92f30..b1b651a8 100644
--- a/.collaboration
+++ b/.collaboration
@@ -602,17 +602,7 @@
   },
   {
     "ModuleName": "PCPage/项目反馈",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-31T15:56:39.3523555+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/项目负荷",
@@ -1212,17 +1202,7 @@
   },
   {
     "ModuleName": "PCPage/人员工时统计",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-31T16:24:02.0746529+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\工时\\人员工时统计.json",
-      "Pages\\工时\\人员工时统计.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "MasterPages/流程母版页面文件夹",
diff --git a/Pages/工时/人员工时统计.json b/Pages/工时/人员工时统计.json
index 7e0123f6..7026a858 100644
--- a/Pages/工时/人员工时统计.json
+++ b/Pages/工时/人员工时统计.json
@@ -357,7 +357,7 @@
         ],
         "DefaultValue": {
           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-          "SerializeProperty": "=TODAY()&\",\"&TODAY()"
+          "SerializeProperty": "=EOMONTH(TODAY(),-1)+1&\",\"&EOMONTH(TODAY(),0)"
         },
         "type": "daterange",
         "placeholder": "请选择",
@@ -376,7 +376,7 @@
         "Style": 1,
         "Items": [
           {
-            "Value": "全部",
+            "Value": "",
             "DisplayValue": "全部"
           },
           {
@@ -791,14 +791,14 @@
     "18,13,1,2",
     "18,5,1,2",
     "1,30,1,2",
+    "1,32,1,6",
     "17,1,1,2",
     "17,3,1,2",
     "17,5,1,2",
     "17,7,1,2",
     "17,9,1,2",
     "17,11,1,2",
-    "17,13,1,2",
-    "1,32,1,6"
+    "17,13,1,2"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -838,4 +838,4 @@
       "Formula": "人员工时统计!$E$22"
     }
   ]
-}//Bck8tkz6GHDqoEr1edT3jgabtzYDQ/LxzR+vFzpeeykXnak2960yNB6qhO0gLAEjCG3pAgbCz/5pdSShmBs6BHe9W749a1cuNpztpYZ4v9RNgxrfX2SMwkhXlvk9RuDykKrVJ3KuGHyoOT0kjcpTLHxVV0K5YhdCoyGgKYiSDYZhVC+wdnUCTxgA9bmo/DPtrf0RnvV/GY7WzxvU4J0Ox0dTB9N7zIjMH0MXTWAMA9hE1rfwRuNpWeYHJVCGvCIkoOZ+gMCELxfUOXtfSzjF62yF3gLLBTSJbJzX9p2y88/8TzgoD8rw896Q0gVubb8YthsCpypF+4OvzxWMzqX05XRjss+PtJfwa8wdNU7t5WJz7dGC287nLDIXjcoD/Q30E9v1vk+j2lUH7H07wlQGwFpxmQnV5JKla/Y3jpaxhy8vMlgODuDP6Z4CkPMtfPM7ia4Utr2FNHsIXyvGYnMhLTQtMZtd8J0x3QRUViQb9mBo7ymmMjOxhR5xuln3BHMCQ2c86+KEmIGQk9TonfCC8gItuTEX4Lm4ssAShxxOCiPkgTrYMiVrlXEyVlHNCpldSUAiI9sgA1+5vLCh47d2MyGAOA+W22JPmzEDXf+pHiuKaK7/lkh+ml3l4irNKG3XCv2KIBWGDFhrQt/zrd+a0m/PWgXBGKKbZhhrULN/lqFN2Sla5QEhesF+ayIn5KeL/xxuwq+Vx8kFuG4V1dxC6kbzgEVhceNUgHitqtCksCPlNlhXC5WvwV0TWvcV54Fd29xb9v4LOYeeeNdUOG1bZ+l2ed35mEvZK+SuF+d1b6zEl6KXf90K/1JoJzQVKUutHZqZ9ewey3JHv2udNgGX+aLJyH+oXkVSmMXz1LCfUxm8hpsVUButKnC6bPniEU8R4EN0EWfh8f2T2BZc8c0wzg==|920
\ No newline at end of file
+}//HH6GKrAktbHr3mfvc+5a6WstTUZv7YqvNyV75m1EyghkfV5zN5oB/2exBSC5+1x2nf8uM17rCVUlSX3yq+V3mQ9dwy7MDC3Yo52S8xb1AdXzmAx59PkQvJrwhfaN0G4Fr4plTdS4nEonr96hj9Nxe/OaDribBHjIJMv8P2zBXDV7ZpuD+8aR1U/Ro3rAXD94PrjCRcRr6QqcfvB85R+WfsIWGHTzuQOhO92CtnlAG4l2i9SRvt4/F0hfPTLLpYtGknfzIyzdLjpMvP41k9c0PPVykg9Yw5msw3ALm90FbrXLauHzMk2WMqIouuei01bzj4fdBmCK8+fzlOAozgDEz1l8l5E3ljScCTEKNeghzSoSJFVpWEpmdozNy0ZGcaNsDm/Ukg96IwiqHIPvxGPUn3SEtDl4403eEjJHeKnB9h/KKS1F4+lXoVU2vn2wAP2mfYo1DP4Ir1O3QythtKvzll4plFkG1vRzTm7B8ddcY57FznFY+GRGtvhVnaQ3DvPmtiau4n+ioOA9fMsRSvv0dM5x03I5AMdAoVDve6RaT81DgLrebY+/VEKxZLkUkUHk7GVoIy1zwhOMNgaLy47nkUHYnpn9sdZIrj8P41nloxw8dXxi4HmR5ruMExdVwhq0Z+Ee8qEMmLD+JqJKu8LHzUyvFQSPYKy1VzLpE/0O/p+oELyd1Ytr3anBkCOIKOLzCNPOdcvf9k/BOmSDDJGifGd9PuxbS/VclJNHGMuykDjUxd0BxK1IaWUFJGuJol0YMfLTGXgrcliIbPwmavrwthOtzkX8GzROg+YcFjHF/nmk5ygj+4sDx/crKt3+H4cD2R0Xz0ivQD8csDviPXKkARr4qyL2qEYI/ZDbnN4gJ9Bm2+InYUk6AYaVnKVbCk2nSYvmAzgHEzItUt5X4y2xlw==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json
index 433fd26e..794dc90b 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json
@@ -1207,7 +1207,6 @@
                 },
                 {
                   "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-                  "PopupDisplayMode": 2,
                   "ShowDrawerHeader": true,
                   "PageName": "处理反馈工单",
                   "LoadBindingDataOption": 1
@@ -1367,4 +1366,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//nR8jkfzRpd3SgH+JtVFAoc8S9YE0dSRcHwR3Fe+gck+dd4vIPKrQEmMObyPUdEHsJV5yElyLFrgv3FpKK2Flp0i0vCAloTzfuT2A2a8nc2kdj9OYlkTeS5j7454NCXVOh2tLUffeDt0AE6syvE2Fdy+hfOSG7yX2uSl/+HMvLtN2FEYuJ2GDPTJhzkZ0tI+0H9DGwaV3V0foZ7M3lPXOF05ebAHhAGBUssbMvXTMm2F0/oYVL3874KJvr/m0GpflKXgfgmb/XudKImsIMs3Fn1upPWNbpgAbNrWAADlhv+yOZbClLTbpVVSRybD28Ho/zo/NIj0uLv83Ht7dHGIMZcSD11CYkUKMt2xQox+4hvsdn1izXXiK9b6txcRBLuzz2GoSi9w79nax3cyQhY0USIe2jAtnzWwdJOmVHYgv0G0LlFsfahfdvzJ5w2C4NXMfs7Ipao6Ih0MGbes/Ske8G2OmbTJRUKP0NglkbM7Cuk3HiAd6veP4/zmoJoMLNbZgN2hPXefZ2mYCxRiPppPoZi+GdsOsyOKJlYA7A2XEqXT5BwMoKUcQAMZ8hXwV100pSRFpFzqgVOhHMWY64dl/nU00ELKS69e2mXkDtchw4/JVDtLkZypCkYkAdsKHJKbpbY1NqYVc9jbDYjxPph/hJCr14b4qTzQLfyGsLviaDmaUgFW0ETbsDUsdgcRRip2+gMsjIRFrB/FGK/C/J9g7Bs7wXx7+YEyJ0sGc3HKhucHzhXQA+NKP5H45Kmj+TAXxQ5odLM3NzpKYyhlj2sapwGbXGDrwsmtf4oUFxLXuaYDEM2XkLBY+Bh2dyhBz96tF3vgZIlDvCpE0Jh0+FikYCRP2wxF2stDPC0L0jxHN7YkrUqxo22Mo17RMnnQQCjLlFNLjNmInhUOv5ngdwnrMKw==|920
\ No newline at end of file
+}//zjc6XdvUUHeokCj+IJuYXuMCEgdLhXEWMz0mf5+qQF0ih69uRwAdKYBhfXxF6zAmQTWvowvpyMfP/g/C6GFPpI4PS0v3slGSDNwJTyewawqhOsDKsfu1DO6qUqdbF5irk+pq9Ayi5/0/34axa+8UMN2v1WSBtfAAMmqlMw+/Q599xzE6gZWTSX3LKeRdihwTZzz8clNP3eG+zPqKjymZ5iDC7GgBCN3G+y46jsEL9hq/zefOUHHngV6pO4qM+gwM549CNL5tvJUs4/rv+XNxZE99DuKhpG1LaBqNPSPgeBDI5QcD6x097Q9OogH7IAyJaQS78pFHe3ORCVlHFFbRE+KO5gZOzTmAItfgJSAj3ePtq5yST3HCQVpC6XoNRJytZ/k7A7CXY5HKivGenlg74axiaUr+e948/WTdbBL2i17VxkgNzjScqIbADyNgCxWXrEgDSNOkMzuTrt+zc1XLexMPjjBYkwn0RiNd3gPmQ09JTGzPZGFfk1OdVDKZIkow1WOiFtPWfJX2qt/cvhrOAQwoqmiENQpQxrp7jZi2Q1jQj0+KGOuw5BsoBXCy+AxX/7erW72KwMKLITkjpE5f33AAYe5zXUZkzei2LiSYhTJS/B7GtCuSWNMZ3RYsr4F+YDTSHfRZrVXBLk/lxQgDLETqc4tyLHW+LSREqc7+u0j+B2r0XRARwVqlKURyJfwVjshtP189QQtQBL1vIU6KypMzc0ttpm/ubGiQdFvrfSUoDnmK8oG7flDLjLX78K+pzwgfwlXygsKdQWwLVwl2rEPBu6iWoDDJN2+CBXxYfrPpWBgqKoYEamMNA373G6y4idBYek9ZxyX2pveoMNcP/5by5NLMHf7pnAUIFdF9rwnzp50OdiLNTVkPKc0KBxh5poe9a3RjB6smIG9D4IUjpw==|920
\ No newline at end of file