From e9afc756804caa8f5a734371b781a60eb146b4e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= <phoben@qq.com>
Date: Fri, 2 Aug 2024 15:19:03 +0800
Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?=
 =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E4=BA=BA=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E6=97=B6=E7=BB=9F=E8=AE=A1"}],"Version":"v1"}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .collaboration               | 12 +-----
 Pages/工时/人员工时统计.json | 84 +++++++++++++++++++++++-------------
 2 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/.collaboration b/.collaboration
index 850c5163..2cdf8455 100644
--- a/.collaboration
+++ b/.collaboration
@@ -798,17 +798,7 @@
   },
   {
     "ModuleName": "PCPage/人员工时统计",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-02T13:44:15.4841426+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\工时\\人员工时统计.json",
-      "Pages\\工时\\人员工时统计.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "Pages/个人中心",
diff --git a/Pages/工时/人员工时统计.json b/Pages/工时/人员工时统计.json
index 345503bb..1efbc2bc 100644
--- a/Pages/工时/人员工时统计.json
+++ b/Pages/工时/人员工时统计.json
@@ -88,30 +88,34 @@
           "DesignLengthInPixel": 15.0
         }
       },
+      "17": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 45.0,
+          "IsHidden": true
+        }
+      },
+      "18": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 45.0,
+          "IsHidden": true
+        }
+      },
+      "19": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 45.0,
+          "IsHidden": true
+        }
+      },
       "20": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 45.0,
           "IsHidden": true
         }
       },
-      "17": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 45.0
-        }
-      },
-      "18": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 45.0
-        }
-      },
-      "19": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 45.0
-        }
-      },
       "21": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 45.0
+          "DesignLengthInPixel": 45.0,
+          "IsHidden": true
         }
       }
     },
@@ -179,7 +183,14 @@
       },
       "30": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 32.0,
+          "Mode": 2,
+          "MinLength": {
+            "Unit": 1
+          },
+          "MaxLength": {
+            "Value": 1.0
+          }
         }
       },
       "31": {
@@ -396,6 +407,15 @@
         "PivotTableSetting": {
           "SelectedListViewName": "表格1",
           "Rows": [
+            {
+              "DatabaseColumnName": "执行人",
+              "DisplayName": "执行人",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!J19"
+              },
+              "BackgroundValue": {}
+            },
             {
               "DatabaseColumnName": "工时日期",
               "DisplayName": "工时日期",
@@ -412,15 +432,6 @@
                 }
               }
             },
-            {
-              "DatabaseColumnName": "执行人",
-              "DisplayName": "执行人",
-              "ColumnCell": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=人员工时统计!J19"
-              },
-              "BackgroundValue": {}
-            },
             {
               "DatabaseColumnName": "项目名称",
               "DisplayName": "项目名称",
@@ -440,6 +451,17 @@
               "BackgroundValue": {}
             }
           ],
+          "Cols": [
+            {
+              "DatabaseColumnName": "工时类型",
+              "DisplayName": "工时类型",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!H19"
+              },
+              "BackgroundValue": {}
+            }
+          ],
           "Values": [
             {
               "DatabaseColumnName": "工时",
@@ -497,12 +519,16 @@
               }
             }
           ],
-          "CollapseRowHeaderIndex": 2,
-          "FrozenColumnIndex": 0
+          "CollapseRowHeaderIndex": 0,
+          "FrozenColumnIndex": 1
         },
         "ShowSubtotal": false,
         "ShowRowsTotal": false,
         "PivotTableStyle": {
+          "HeaderStyle": {},
+          "BodyStyle": {},
+          "SubtotalStyle": {},
+          "TotalStyle": {},
           "IsDataColumnAutoFitWidth": true,
           "MinDataColumnWidth": "120",
           "RowHeaderColumnWidth": "200",
@@ -752,4 +778,4 @@
       "Formula": "人员工时统计!$E$22"
     }
   ]
-}//bOtlDE1H1JiRr7grKv45T9s0FA66/ijDKL1n6oM5RV+m4AeOO4CcdAtJ88wvBcNfuTbnwGiQWOSsOzHYm4cVFDcuPmeO1AFGGA29iA9M+S+ZjhYiL3bCQQf8FJLp2n+OsuMvttRZPT6aGRdbjDVai5QYYK2Z1m+y8CdRC+ie4NxLTylyQ2eSwzG25seQdzEAY5G6Kha8h8kW7zlaARo1Wriyb1JntEEyDrL9hcjrOZfVip17SeAUInUB0wQUGElx5Ziv2O5APKeWvbrJfyVJ8ZXf2XiaJMcZFvkpRJvNfXkz2LEf3IFBaoyHCNOHp0+rqHeWcsOJb6YvVVRuNADk3aVbMCvfe8AtGzEaiY4iAX8cwHzeBMzEHJvNseVpBHR+SVifD9TgXxyuLcO4Jqftn9Z81TLM7idbTNWfASFZdUYZQmoTtMEC/8K6ExXIGbF2imc6/S0xgdBxdYpUTOKfmJmHpAlF3t6JHBtibN8hw6362OnUu3uBClt+GkrvHBbQW0x92c4oy885jH4oh9Qnc6ORcMsNCtrNNe9kJay6ZzlcJ4J3H6DBZmCmW7Jw4QwEEkA3qKuJ3SyCuOThcUTCRaT1fVwS4yINTgDvLeaW5cWqUBKyXjgqWISOQPZIvba6Dsf7nKWPcrt94FTF+xwwSNiW8fKdv4iklewGVCmOoAUQLFcBH/nZ/BDpb2DD2jkqBiJU0s42uHrH598VBYrcLLoop86aoBVVnIU2ocvbRoksOD7qPDH6usKdNtt6wD59L1PVdd7op47VFrLfci9lSwlHfiE3/mwx0HqpUlX6yKlvjf3gkBsU5dqiTGe9KfSBrdLjWsYHewff9PfYk1N6wEVelUTB0ZNGdtT5iaLBY4FVZiKMF54jwfMtjRYMw+FBBtW3sRU44UjsE8QNOhOzug==|920
\ No newline at end of file
+}//Gl9Gt/JaMqY7i8yz0/6fa2LKERWvZa4dDQMveyd6LzCr9RXFE2SVTmQsrK7X4RPWxCQliU70JDsoTdO2awZL7eg4R+6s91K9vHWARNPFVb09PtkABOpU5Pcw5kDWjAPKw2IkV4/Vm28C5DNRHfLR44f6WwawbQE/DdWb74VQzDypGg5rjEWq7qhCaZNe+GKnz+XNCZckyQHDDw0oLXzjkmebMu7P/PVk6uZfSjqC6+9AQALDQXOjd3DAc5JHd6NMNHTeEcMZzZzLOTOaoDPhYdwk3n4mLXNErizqONlyWqW7goyn8WSMhm1o1uiA4WNSCizhF91ZHo3/OwfK7WVvvqDlYpl1YbG1ow3ixOu1vXF+vUWffAOrii91W0J1IBWkXVNd9JKB7jyRNMklHV+B+eQUNjFHn3VQWvijKurkp7sSSg05x6+TffXM8xW7Fmbs8QS0hakSaA3qPrLyrF4lIRpXDefv3+wg61su9WH6c2MSVb8bqhTR8Pruezz2g9TYEvpEqUvhDmFz9kbB623UeW2deh975HOifiS4e9kIZJ2iXW6liZxzlwqH+Z1llrP7fIsBQPoGfZh6WtfEdELCWl8XvYI4gq3vq7e313whZSTAkI+wiemQzChrGTZAPzRG5DpUMAb0RcVqh0GFeOPQ/oVwVbXubeZWu5Krl/7MNDddaxsf5D6Xns40IIkKmriIFsKp8Y2oK6NjEjtsJv2CTaflCTmndcIKzb+DQr4q9HSb16wE+78HXZ+L577xJh3HeNka2JB1t3OacXAEscZg5ECdlnsVAlZqXAYXGfYRzrKhhZ2LgSvJkrCYD/XNB5Pss2PwSKRuJZcx4qxjHXQNb09+wn0Kkets4qbtuoufAfBI/k0DXhyREwVj25OwLLjugl0hivYciqfuQFh0qRHazg==|920
\ No newline at end of file