{"Message":"1","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/人员工时统计"},{"State":1,"Type":1,"Name":"PCPage/项目工时统计"}],"Version":"v1"}

.collaboration

@@ -1198,17 +1198,7 @@
   },
   {
     "ModuleName": "PCPage/人员工时统计",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-10-04T11:18:05.4289313+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\工时\\人员工时统计.json",
-      "Pages\\工时\\人员工时统计.rd"
-    ]
   },
   {
     "ModuleName": "MasterPages/流程母版页面文件夹",
@@ -2472,16 +2462,6 @@
   },
   {
     "ModuleName": "PCPage/项目工时统计",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-10-04T11:10:41.5297118+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\工时\\项目工时统计.json",
-      "Pages\\工时\\项目工时统计.rd"
-    ]
   }
 ]

Pages/工时/人员工时统计.json

@@ -443,6 +443,14 @@
                 "SerializeProperty": "=人员工时统计!H19"
               },
               "BackgroundValue": {}
+            },
+            {
+              "DatabaseColumnName": "执行内容",
+              "DisplayName": "执行内容",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!J19"
+              }
             }
           ],
           "Values": [
@@ -459,6 +467,13 @@
             }
           ],
           "DatabaseColumns": [
+            {
+              "DatabaseColumnName": "执行人",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!B19"
+              }
+            },
             {
               "DatabaseColumnName": "工时日期",
               "ColumnCell": {
@@ -487,27 +502,6 @@
                 "SerializeProperty": "=人员工时统计!J19"
               }
             },
-            {
-              "DatabaseColumnName": "执行人",
-              "ColumnCell": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=人员工时统计!B19"
-              }
-            },
-            {
-              "DatabaseColumnName": "上报工时",
-              "ColumnCell": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=人员工时统计!L19"
-              }
-            },
-            {
-              "DatabaseColumnName": "计划工时",
-              "ColumnCell": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=人员工时统计!N19"
-              }
-            },
             {
               "DatabaseColumnName": "核定工时",
               "ColumnCell": {
@@ -882,4 +876,4 @@
       "Formula": "人员工时统计!$E$22"
     }
   ]
-}//lmaKEjeU6z5AYDQHGcWn0h8cxJlCVinKSD3FWY75qKt+D0f9DFCcEmzNJ7LHhWlkG4nVJBg7tyCRzk7Cycw0sfiryI6wgIP6+fODPdAUwonRSIguYsVi8I+tcWXvhsg6QBI8vZc0FoqIUgfrHJ3oaiHLamvoN23GFG+oxoXNrp5CoIH36VcNq9QL4U0aJn7TIC/pV8OBQh+aBKwwYBjZIgMQzTgdTWICbhGGzbqhGPsRHdYRxDIzsQvp2egSn/c0uBx56HqGP3tsmjmVayoes70SRgIxcXkp6anUUL8Ma+z0TtUmbE4P4eP7agaDogvvxNtADlbnU9ERN8pkHkzCGMVf1EsoBjMgPkhbaACaFyQDGPYUve3LYXheNTUuR4ehOPyETYT8cegrEz5jzLQtHk2elJnvdwEMQTj/ptGa79JIvaIAqdTYDdSU/BgKdFu3aqnQuwLp2q88weIL0pI9rMoGdPgzXwSa9sZXLUVEFxRo2cTzv2yPaMDmXRD0mPSS2IPBPs42q2M2QQbWWEG3eh70nMDyp6DO+MCUxhI3F3jJkpUwM+JZFZ15R51XOiMXnr/ueqDvRonbtriw/S2wdBT8QJ98PRryfBeHiRp2VE9KMp5L4QQfJP/ESdazLCVjGDiiSjO8+wuFvrwPu5e6lWFGQrHdN/9BiJEfgyIdQlXZ91QreDOLVElIz14jGVwWUS6NtYxhkBF602rYJCKecc7Q8Bt59J4A2Lbsxglb8WhJHpdD3cLrgu47vPB4eH22O8nIR5xAm9uMTOjdiLeCnWOoHAEsvvkhatRbiNpGdq1A7e/Jn4zhyMzpKtXYjNQ3sNSKqY1AWGVXS8dw9dbPXDFSip1lu7SRPxjRic5aFuJk4Uytc6o9q648KNl0d/+mxQcFQDKxZkT9616TalBWpA==|920
+}//fT3C1cdxTHdmSO1J83tm/qeiah/56m1usGF5aS9OV+fKFH7pVqwN/rXtpSOqexxyiDrsD2FKowgCOgH3GgykmLJI6asFTxmsqqWK9RfSGhWCrwU2DEyAtVozg0Xw22iP2EHh3U2aADfpo2Rhcggq2V6DWjTKwOOfA9yb4ThPoh+wJrpr/E8p6pV18aDRFvDqGxyqnrwiIu7HSkEv/mRoNCzh+otZU1D7tSH23yRI9lWK7f8EQbUDziF6DmK5n19CamqNo7Oir3esAlACa2z/GYcMsC69L6BbIQcHJTq+ZOyfcOpCbY/KKqHjw+IdkoC5hXwZApVWS8UoF2uEoK1NHkrisGGlDZM3JawGeVbgfOFZQyFdmn8Vbr+ujJcq1uADd0UkpdQ7DEeAJvYI0rzb+yhgkucJ1FpSTy+gIk6OaD+uTxfvYh+4ykVNefNa3i9aXkbjgFhTvcX85gxx9oZkGMamQQ42zFatTenm7OzitGkzBDDTFF0qGCzX0Kml3tWi2FDDg3rmnBjytzfSg9qYyPtQtqxeq5Y1p7Kb3REiWw6FkhYLnb7q5AhPQgiI6239ybtef0DONTHz2qT+lUwgemaWpOPhLj+EiNiNnLRiRAf88KeMaE8EApw+Hp39TNncD37B6gkqaeEsA+h2rpzFag0QLa2HOm0GZPMAtl96WmZ6b04jRcz0IkwDUL15iEpzUDxPzvBa59G9bqhEFQysh5GePlrRd2OE8sntNylxppoidM8hUc/t/a5L5iDIPLTNSfCSr3AmxegJ8E/LrS1wn3eAFKha/e0jXkMm09/McIR0uwwgLBmJQnA4SrUDP8KVHxLmMf4VfnknS5FPVpPAD/YAbW+fuL3hD5MwPGWxxMWjpOUR2M+Rlflqfa1z61T5M6IaAJDZJWoPe0x7kQOGnQ==|920

Pages/工时/项目工时统计.json

@@ -420,6 +420,16 @@
             }
           ],
           "Values": [
+            {
+              "DatabaseColumnName": "上报工时",
+              "DisplayName": "上报工时",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=项目工时统计!Q19"
+              },
+              "Aggregator": 0,
+              "TotalAggregator": 0
+            },
             {
               "DatabaseColumnName": "核定工时",
               "DisplayName": "核定工时",
@@ -474,6 +484,13 @@
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                 "SerializeProperty": "=项目工时统计!N19"
               }
+            },
+            {
+              "DatabaseColumnName": "上报工时",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=项目工时统计!Q19"
+              }
             }
           ],
           "ForceFrozenRowHeader": true
@@ -609,6 +626,7 @@
       }
     },
     "18,1": {
+      "NameUsedInJavaScript": "项目ID",
       "BindingInfo": {
         "TableName": "View_任务工时统计",
         "ColumnName": "项目ID",
@@ -616,6 +634,7 @@
       }
     },
     "18,4": {
+      "NameUsedInJavaScript": "项目名称",
       "BindingInfo": {
         "TableName": "View_任务工时统计",
         "ColumnName": "项目名称",
@@ -657,6 +676,14 @@
         "ColumnName": "核定工时",
         "GUID": "901bde3d-3616-4efb-adfa-3adfbdeabcf5"
       }
+    },
+    "18,16": {
+      "NameUsedInJavaScript": "上报工时",
+      "BindingInfo": {
+        "TableName": "View_任务工时统计",
+        "ColumnName": "上报工时",
+        "GUID": "ac0c7db2-a585-46ad-a59c-47e86ea236c3"
+      }
     }
   },
   "StyleDatas": {
@@ -800,7 +827,9 @@
     "17,11,1,2",
     "17,13,1,3",
     "21,1,1,3",
-    "21,4,1,3"
+    "21,4,1,3",
+    "18,16,1,3",
+    "17,16,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -840,4 +869,4 @@
       "Formula": "项目工时统计!$E$22"
     }
   ]
-}//6BrJzaWpXHG6qr9A0l/IdGzzau5aAGlA/MdT5ew2Q3Ubt0deUX5NvLnVGqcvavO86Ib0I5QxeiWCHSwIO9zeOgiOB5Uwni0cYo5Ic4v8d6QMRsKZc0WD8btUMOZ/xUiYhyV5/uPU+nIe1vpoQ47hfcyzjlc/lTTN5xXF3b/GOUBzmxM4FrtMFkkLsH1CqqlcmWQpKwie7ryD7G4M+2KIx+AdYyfwK/UMT5OJPMTPaJ0oLyiTn6LozVwoprfHWDq6qZQeAIBMa+Xu2u2VlP8h40foUH8d/D7gWBFAHzUdKtDtzlKSF+HKDpNChc2meyFE7mgGVz7nXHB4Mr9R6cP9GpuSGoH0YBkMy9yxMxSWhkWm68dnXjW+YkVXMFLfN2w5v8fL8mRokyRBmN/PG7qUtMZ3FAMmHZTiYNMt+cO5yx+fA5inWr0Vp+AWCq910FT3XkxVgUyV4vgOHILoP/y9WiCic/IQCGMD2Xms/G4nl/jvU7FQ6s0cilFmfRWfmvKWkz+IxaO5Xfj02Ymi6VHh3pHYSoJ8gJNSS9IuYOHWXPsQjvied8zdXVPXZAVK4m5N7q/TFdw+4GQNqeevlrIbK7s5JCyCyOTEjzemBasbcEa0O9PO0kjsEeX4YGGnAc3+SkEXosso5IMAI2fKfwnDKK3fW7toG2SSbCYLRyCQe69kd1F9wM+pHBy65bonW4zil36ekywnOSSyauBXeV2vPK3sqkrxUC4zVe8eHYBH15ylfmL/uGKARyFvHD/tH7AG+PKJ6pekQbVKDbQQtgAu3fJ7TvX2HaZ3EiCQRcwKsYvBwy0wIUM0Hih1DgrH82DDMHCq40Yl7mJX84KAIR2pgMVzTUNBJe1DDB3fvvXYqMoE3X4BzGtfZYZzujuJi39S8wMs3sf5TO4DIy7v4X09xQ==|920
+}//o0JND7sv5RTqIArNN/nMMXFkwET2KLJidYcS9wErNMKuG6EydB6zmePtTsSMgEKOPs57vYkz/j+h+8Rz3lA730MddL752r2uyx7sxg293xQsiGA1FzIhuHVLHixRnlSFy9wWuVMLfFlSZqyUcxjK6cziTBaQrdYgQmtffMjeCdRCK54ajGaWwJvjEDh9AVgiz5KPRWUiSBKxVz1m+jfG+x/7q5rulcfa7/e9Gpnk2y1pfh60Acb1OeAoZt2JEIOvLvVwMHODVa4iq+bB3AXgAOZolFVgnfMnHBt5StE5cT4/ONF2bpQUihWMQVANM8P1DhLWR3fVMhPF0+XBhIfT8re17Mb7WpIHJYLa1tuGm50FOrZ67ion4Maz1GOXtezrDxFJPk7gyMnbTRshwsjyd0RujjN5qDkD9gjljtaJh+vM/WzRVziFTLLVcY4RJ+QvyQDy+gluYkQFJ9A9yV37/CAYWGrx5gx8DgHHOlDeJ58oxQNYZmdD1f0G/I/n4uZUCd4lvhUFtO0jlgk+leLyEAMW1khEJl9vwx4Rxn0OY4sGsrAvuaIg1lNy7hN6zi1UmDAq3zQlmJ741Cy0tnqeLCcJFVRzH1XrhQctPEMjwGs5Kkv9pPb4UCBpzhVxDOykUnfq4T6razXfZAsTlP3cDkyll6iu4qwG2rTUb3QUSJppRIZzV0owkmZKP0CLbH8q8tixlxxk40Hjn4jlx1lLrjwSisgO12uPj/o5z1AjMDqujR4cRIwW9Exms6Vwr6J9JkxsoOyaF6jQ5lrLtAyMDza6QJ8fl4P7IbhrAxpk2EvxHxp0Lg9JplFHQ0QqJSidd19Jr9sW5Tj+X5MlnmgJIRZheNZ6R2vaTSuYe5np1ehMaK33Kxr5OafSaLT7//LE+DbpTVi2Yl9ww7q9GNkz3A==|920