{"Message":"修改工时的逻辑，支持工时分配模式\r\n修改工时中心页面","MessageType":2,"Modules":[{"State":1,"Type":23,"Name":"TableView/子任务视图"},{"State":1,"Type":23,"Name":"TableView/View_任务工时统计"},{"State":1,"Type":23,"Name":"TableView/人员工时统计视图"},{"State":1,"Type":7,"Name":"Table/任务工时表"},{"State":1,"Type":23,"Name":"TableView/View_项目统计信息"},{"State":1,"Type":7,"Name":"Table/项目表"},{"State":1,"Type":1,"Name":"PCPage/修改报工"},{"State":1,"Type":1,"Name":"PCPage/新增报工"},{"State":1,"Type":1,"Name":"PCPage/工时详情"},{"State":1,"Type":1,"Name":"PCPage/FGC_维护中"},{"State":1,"Type":1,"Name":"PCPage/预算申请"},{"State":1,"Type":1,"Name":"PCPage/项目信息"},{"State":1,"Type":3,"Name":"MasterPCPage/FGC_母版页"},{"State":1,"Type":15,"Name":"ServerCommand/修改工时"},{"State":2,"Type":15,"Name":"ServerCommand/新增工时"},{"State":1,"Type":40,"Name":"Plugin"},{"State":1,"Type":15,"Name":"ServerCommand/同步项目参与人字段"},{"State":1,"Type":15,"Name":"ServerCommand/新增或修改项目"},{"State":1,"Type":1,"Name":"PCPage/反馈与建议"},{"State":1,"Type":23,"Name":"TableView/项目匿名视图"},{"State":2,"Type":1,"Name":"PCPage/工时报表"},{"State":1,"Type":18,"Name":"RdlReport/工时报表"},{"State":1,"Type":7,"Name":"Table/工时分配方式"},{"State":3,"Type":1,"Name":"PCPage/分配计划工时"},{"State":3,"Type":15,"Name":"ServerCommand/分配任务工时"},{"State":3,"Type":15,"Name":"ServerCommand/上报实际工时"},{"State":3,"Type":1,"Name":"PCPage/任务工时统计"},{"State":3,"Type":1,"Name":"PCPage/人员工时统计"},{"State":3,"Type":1,"Name":"PCPage/工时中心"}],"Version":"v1"}

Pages/任务/工时详情.json

@@ -225,8 +225,8 @@
     "3,18": "完成比例",
     "6,1": "明细进展",
     "7,1": "工时详情-列头",
-    "10,9": "计划工时",
-    "10,14": "实际工时"
+    "10,9": "分配工时",
+    "10,14": "工时上报"
   },
   "Formulas": {
     "3,20": "O4/D4*100"
@@ -322,9 +322,10 @@
               "ColumnName": "总实际工时"
             },
             {
-              "Formula": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=(工时详情!总实际工时/工时详情!总计划工时)*100"
+              "BindingInfo": {
+                "TableName": "View_任务工时统计",
+                "ColumnName": "工时完成比例",
+                "GUID": "d710b31b-c612-4de9-b6be-1f60bc47ef01"
               },
               "ColumnName": "完成比例"
             }
@@ -354,19 +355,11 @@
         "CommandList": [
           {
             "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-            "PageName": "新增报工",
-            "PassValues": [
-              {
-                "Source": "计划",
-                "TargetCell": {
-                  "SerializeProperty": "=新增报工!工时类型"
-                }
-              }
-            ],
+            "PageName": "分配计划工时",
             "LoadBindingDataOption": 1
           }
         ],
-        "Text": "计划工时",
+        "Text": "分配工时",
         "TemplateKey": "圆角浮动",
         "Icon": {
           "Name": "Application/005_add_5.svg",
@@ -375,7 +368,10 @@
           "UseCellTypeForeColor": true
         },
         "IconSize": 14.0
-      }
+      },
+      "RulesGuidList": [
+        "a8e409dd-908f-46da-9e04-493e23e6f6ff"
+      ]
     },
     "10,14": {
       "CellType": {
@@ -384,18 +380,10 @@
           {
             "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
             "PageName": "新增报工",
-            "PassValues": [
-              {
-                "Source": "实际",
-                "TargetCell": {
-                  "SerializeProperty": "=新增报工!工时类型"
-                }
-              }
-            ],
             "LoadBindingDataOption": 1
           }
         ],
-        "Text": "实际工时",
+        "Text": "工时上报",
         "TemplateKey": "圆角浮动",
         "Icon": {
           "Name": "Application/005_add_5.svg",
@@ -412,6 +400,18 @@
         "ColumnName": "ID",
         "GUID": "a480c8d8-43fc-4d8f-a19e-554d2c55d49a"
       }
+    },
+    "12,7": {
+      "BindingInfo": {
+        "TableName": "任务表",
+        "ColumnName": "项目ID",
+        "GUID": "9c81a94c-e07a-4f8e-82c1-2004e9ecaf2d",
+        "RelationBinding": {
+          "RelatedTable": "项目表",
+          "RelatedColumn": "ID",
+          "DisplayColumn": "工时分配方式"
+        }
+      }
     }
   },
   "StyleDatas": {
@@ -629,7 +629,8 @@
     "3,7,1,2",
     "3,9,1,2",
     "3,18,1,2",
-    "3,20,1,6"
+    "3,20,1,6",
+    "12,7,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -657,7 +658,26 @@
     },
     "RowBreakLines": [],
     "RepeatRangeSettings": [],
-    "RelatedDataTableName": "任务表"
+    "RelatedDataTableName": "任务表",
+    "ConditionFormatRulesCollection": {
+      "Rules": [
+        {
+          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+          "Formula": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=工时详情!$H$13=3"
+          },
+          "GUID": "a8e409dd-908f-46da-9e04-493e23e6f6ff",
+          "StyleInfo": {
+            "Underline": null,
+            "Strikethrough": null
+          },
+          "IsDisabled": true,
+          "IsInvisible": false,
+          "IsReadOnly": true
+        }
+      ]
+    }
   },
   "PrintInfo": {
     "PaperSize": {},
@@ -673,4 +693,4 @@
       "Formula": "工时详情!$E$13"
     }
   ]
-}//0A4t65d1c+/Htjba9YuwALruutUmVJ3wJFBmQutCvJwCjfdBdY1VruRyHvGUe5Aw5U9zZHkef7j+L59pPiG/EH1iS5FXsQPRrxlOY6/qzvybTtNQDp63R9DyeniYXgUaozDGgwyjWMItdgtfWMD73r6Vy/GfSrnxQJjGPHVz9caPlFg3lfV4sPP1uKs35iNmC5I3fnmoEc0u9sYDvCqL54Azr8CYLpwKWylkxRQJhslkvqwZdaeocsmyR01/ZTGsQ0GHMljIG/bp1yN0yi8z5MUr1ncnlQ0QydhL0I8ajoGdhjcvoMveQcWQTutu+/YAyRG9RNAV6FB3oTTLy4IwQ9ABsJXucTIF5Bb99mHNnh9frGYexxmZ+a42CsQQfxtQKP094nafXCeQTFBMR+0RaPNvxZjdm9JUpJ22Bfb0FKzzJu7cODiSSaN4D2+m2IO8E04oMc55BI59tLKsGXH/YC80ZshU1vh52TSjCQUrR0zUmiqGnY9fZ661gWENHa9s1EVqLdn1y60mhuf4DZVkcFjufjA9dUfULGc2MylZI03+Hlfm5reOHxAXMEIu/SS1VAI7C0qSNsYzPzajewqrfUfbQWr1zQx5v/JRa4K/M0UTy9MolXi4aqi8rSQM+FrPUy+kho2+K4o7ZiGoksCuegxuDpy3/xEoLupHlT2iDkvPVe9oxcTEEucQv50/oLCOhBXWiTx7Z7yJ1nMX/GLyXVVVJwvnm2P2+q6VkaGgoYjY1HmLkHOpsV4ZJLcoeQjfJo4j3dH5wWwEjbqkCBgCnOvtYoUR81eIa3XNY2RKvViO7zhoLcz4vxLBE6K5uiGTZIXsfQ9Q/ohBLgzX2Pt3niV+EH3wRMnUpI5jdyM6h7zDoD5de8NjK0TkwDKdTHGSlSFkTEFxlTcx+O3d0AhIjQ==|920
+}//XBiWrd0avZYou4JlEVczK+UtKEttD1Uh9JWTOX+W6lfXD+pzjm8cy4Qxnn562ACWTw0EtvbxRpslgqsI0HV8wjxDzImNkxgGdWtvFzyo0Vk2CQcWIM6Qvo+AMbdVr0lmrmMQFdGlrnj7K7mc4oddIjILYTtUQPdpZQGE0rzLMruvvjzvLG1z1ioYMXXq6P9YV8OozPN0ZOm95rUqoFMC9L43KtkcrWMwPe3hBrTI39QFwE2THHgTk/kFH7vbslxnW1IWOj+D+lNMv9G1eDR4A++gJIoVyIpdtQT92LD3LW2nqhGiG8134fBzZFiNQewkyYDF/4BL1Byu12uY4rxB1o+1hj8RHg3lwknaCtbZGmHXHq+fl6yo1RqtzUZjF344eLIYP+6gMmzHzvDCoKJTBxG3KxOsZdQdNJfgrAhxo0Dh6kBVkTyLc7uxOT8nbcvrjOV8m39IPW4eaoA8WVr+59WVbc8YXUEJI/Lrz8kscJiEqVFCs5idYDhFMAX7+K2BGycH0YiBVFLy6EpptjDm9IThU7mE6Z/oHoaeGSQRyKmmkV46JNxpV0VqFlUl3b8qse2ytbY9UMUHIg1seRx/l6iYksM/o3HojRWitBhWYgiXdaEM59WAdEODHXb3PUJE3Xk7o34NzABU1g1hfkZdlGLca36AYUb1V5u5nPVlrV5sIWNpAfzic+OVuyG3IwZAcpWpnPjIJe3rTalTvOG0Se4mXkx2vHzA8H3wFfyHsxsjRammEd58CMKXcktX7LTvO0R91pgBGyd091XNnTTkg9wZb8mBcGbgysDSoU+dQUmcHqOC2iZKkpBmIoOtpMsnVVk4fgTehy9sS+reXpGrDCHK6SFHBRh6jo7+svLAMfkYDsGM1p370Pfscys0C9uLsDVX/D1YnSRka4X7Obgmjw==|920