{"Message":"1","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/项目成员详情"},{"State":1,"Type":1,"Name":"PCPage/任务首页"},{"State":1,"Type":1,"Name":"PCPage/任务-工时"},{"State":1,"Type":1,"Name":"PCPage/工时详情-列头"},{"State":1,"Type":1,"Name":"PCPage/工时详情"},{"State":1,"Type":1,"Name":"PCPage/修改报工"},{"State":1,"Type":1,"Name":"PCPage/新增报工"},{"State":1,"Type":31,"Name":"UserControlPage/工时记录列表"},{"State":1,"Type":15,"Name":"ServerCommand/上报实际工时"},{"State":1,"Type":15,"Name":"ServerCommand/计算报工数据"},{"State":1,"Type":1,"Name":"PCPage/核定确认"},{"State":1,"Type":23,"Name":"TableView/任务平行视图"}],"Version":"v1"}

2024-06-26 17:44:32 +08:00
parent 610796e15d
commit 398c93e5f1
20 changed files with 622 additions and 632 deletions
--- a/Pages/31a709cea02e45ad83bb92336a6d829.json
+++ b/Pages/31a709cea02e45ad83bb92336a6d829.json
@@ -138,10 +138,10 @@
      "TemplateCellSource": "全名"
    },
    "1,4": {
-      "TemplateCellSource": "总计划工时"
+      "TemplateCellSource": "计划工时"
    },
    "1,5": {
-      "TemplateCellSource": "总实际工时"
+      "TemplateCellSource": "核定工时"
    },
    "1,6": {
      "CellType": {
@@ -224,7 +224,7 @@
                            }
                          }
                        ],
-                        "ID": "b252fe24-3d40-4876-b873-9a4c1cd191ae"
+                        "ID": "334fc9ed-3e0e-4b02-b992-241ecf046a00"
                      },
                      {
                        "CommandList": [
@@ -239,12 +239,12 @@
                            "BtnText": "知道了"
                          }
                        ],
-                        "ID": "454a74d9-ba2f-4408-9698-f2dd39d37e3a"
+                        "ID": "2f0d7be7-3ddd-41eb-adb4-a1935295962a"
                      }
                    ]
                  }
                ],
-                "ID": "69ac83b2-27f6-4055-b884-3cbe42df6509"
+                "ID": "2f08c35e-b031-45e6-8f86-3b36da3e367e"
              }
            ]
          }
@@ -252,9 +252,13 @@
        "ToolTip": "删除",
        "Size": 16,
        "TemplateKey": "按钮图标",
+        "IsInvisible": true,
        "ImagePath": "回收站.svg",
        "UseCellForeColor": true
-      }
+      },
+      "RulesGuidList": [
+        "b48621b8-03b6-48fa-b4ea-b21d9a9ef3bd"
+      ]
    },
    "3,0": {
      "CellType": {
@@ -366,7 +370,7 @@
                                  "value": "编辑"
                                },
                                "CommandList": [],
-                                "ID": "f25c1d8e-4c3e-467e-9b4d-8335eda2de64"
+                                "ID": "74ca53e5-04fb-48a2-95d7-76a8fc29bc5d"
                              },
                              {
                                "Condition": {
@@ -420,17 +424,17 @@
                                    }
                                  }
                                ],
-                                "ID": "2d7f3381-2de1-4839-ae84-fd862a9a05c7"
+                                "ID": "9e86fd86-ec47-4494-8fdc-c97c8c08d87c"
                              }
                            ]
                          }
                        ],
-                        "ID": "e8a1accf-755d-4754-ae86-68086fa1f6ff"
+                        "ID": "b1c1d9a8-6f0f-455e-8551-34220e5fe580"
                      }
                    ]
                  }
                ],
-                "ID": "5e46fac2-6bb7-4bf5-b583-2043eb199198"
+                "ID": "860e2189-f85b-448b-af6c-41d9453fb95c"
              }
            ]
          }
@@ -544,10 +548,29 @@
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon",
-    "ParentPageName": "工时详情"
+    "ParentPageName": "工时详情",
+    "ConditionFormatRulesCollection": {
+      "Rules": [
+        {
+          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+          "Formula": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!$D$6='31a709cea02e45ad83bb92336a6d829'!当前用户"
+          },
+          "GUID": "b48621b8-03b6-48fa-b4ea-b21d9a9ef3bd",
+          "StyleInfo": {
+            "Underline": null,
+            "Strikethrough": null
+          },
+          "IsDisabled": false,
+          "IsInvisible": false,
+          "IsReadOnly": false
+        }
+      ]
+    }
  },
  "PrintInfo": {
    "PaperSize": {},
    "Margin": {}
  }
-}//+0BgRdj0bIOXKeAs1/0mkV05OzkJlYte1y4b9mBV9iEA0eXY2LKc5tTtEM7QBXbh8CGR8MbTWI6huvzR0188DFcUPNjW3b8aMwOvPGDRW9JmYG4eJscUw+JMnX1+8rrFGfTysFSJpsEmF/idbElcs9yYEBbCSpHbN5k3b1fpgelYnKxx1rY5sK6dqsWQN1S/CnE/70j2HKtwUzjqpstVjLvJUPmM5Gu3HtMbG5MjSk9/yCvdvr5GJVtCusCpWyRSaaPYLpRH7z5lon0gJIRXJEWLQuDIBjjJTI0fLWnKuJ8wSGlZ+lqWAGVkgwecJAv6Nq9Wh8UmpJZ0zjHyNfPRBTARM6crmokV1SO2hKvg3wWwWlPnYkyPsdjtPJHDVqIGGOmY9T9A57knJuRe4PTwRFUFFrwod8oFlq/Uczbe3/uc1yrLcDBwE3bLNA3E93hYFe1FAbyRdYnXFSK7Vv3CVbDUGakcK+Eylecmn0g64+/IoHeh2urXT3A6DvoUTyN5oNXsHXTcWZYNO4c4V0k4p46a0NuFyfGVGX4fa0Y7eYJQhDsBM1TFE1miKBZMktIOu2GFlRBGY1RwtEb4AkNNU8lDUsnWnQ4h2HalrxtCtqjRHpS8urUxWQ7feIWx0X6PuI7dVOWC7sIhEeeSLXtyou11GYNtkl/TA/uiR45e8NtlUH30cFEAyPodYp4RskCyC2fn70VT8mJ7+krIl4850nOLt+zdEaR5mWrG5m4gTHoHaPSUHQ7joBXpbA5kZrOhGv+YDcxucLiVmls0V5Xcwfckgwmk3v3NY1PSq4y+pK7sFcxeQyEr+lHKGqi34YVvLYA1fTtt0lc2ow6/tDOMdezx2hQ0+QjzI5lttFo2EQ9p/0p3On8L84Z97wuc7E8BHjMIMx63r+jS6/zJP4wqyg==|920
+}//7hX5S54Uxhfk4havmiZXap+y0D7DMql6rVSfmJtLV8CEDxHkPb2rslVF8dqIMygB3M6vbZMq+R9i0rRfbL/9gr30g3CjxkhMjD5szgEmCaz+DkDZ8MhqqUObO9/fmYt/DxixSi/PsKZgl1sTg7JngQTIzLBixXavsZ7BMV4ZWiS/UjakVNbmKXvucFHdREr3Tf2bnDNQGt2Wjm6q+K00V6uMACKB+rrR69oO6mJa3EJsWPKCqVGenUxxqtovn7eGkDw9ZGsRXlX60ie7J/n6Hdh3vHeYhw5cD/Z4Vf/vSDKoGrQ+kzPMKSDRBll/iX3ZNARzxuqc2ntAGo33h0YXH9Qy7Ks5vI2lff2iC09/Vw995IhFsZMngG0QbgB6JxzC5DUI6vEUvVeCxd38+gUgVfdfGLDtKU1+i4fEIb9Rdyl1psTANjlds78upNzoLUsgvi44mP3iFfIwHxJWnaVlMN5oMr03XMCQSD7GPr+ItNETHraL/NkV6W2xC2QjSzwrkG+5m5li5szs7BUgu4sCsqXuRX1VGbVhHUA+Y0sxNZOCpZboMJKcJswrvENAeQx954uvYimMU/1y3Z0NjV7l0NCEw/iVfr/fh2eo8dHxO6bGnKspW4NQ5IGP7+RvCwQjXqGJgcQJLfo4crlz+aE4Yfx72KasEHI05LUgWLMsMRQ1GebgVPtd9oZ3PyKjy3vJH2qSFRJQPeBiNbAYpAskB0rYIgmhDqs+XjLdGn1eItglhOgtD3hqWIqhbIKjmfWIBTLTu1xhD/xS+JsJhjmqivSZHlkn8NF4kO9dxOY1VKUp8KpTHwt+xygG5YwoxJV//6pFg9/ebQb57zVV/IgwSJRlN4oUrcOQwjIXtEnsSc7N799kaC3LnPaSpBzqz/Y+m+AtrtI32t0T26uL9rnd6w==|920
--- a/Pages/36d33d0079644f28b16bd0fec90394c.json
+++ b/Pages/36d33d0079644f28b16bd0fec90394c.json
@@ -21,9 +21,17 @@
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 10.0
        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 27.0
+        }
      }
    },
-    "Count": 4,
+    "InLogicalVisibleIndexes": [
+      4
+    ],
+    "Count": 5,
    "DefaultSize": 10.0
  },
  "Cols": {
@@ -114,13 +122,45 @@
                              },
                              "CommandList": [
                                {
-                                  "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-                                  "PopupDisplayMode": 2,
-                                  "PageName": "修改报工",
-                                  "LoadBindingDataOption": 1
+                                  "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                                  "ConditionAndCommandPairList": [
+                                    {
+                                      "Condition": {
+                                        "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                        "param": {
+                                          "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                                          "cellLocations": [
+                                            {
+                                              "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5"
+                                            }
+                                          ]
+                                        },
+                                        "value": "%CurrentUser.UserName%"
+                                      },
+                                      "CommandList": [
+                                        {
+                                          "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+                                          "PopupDisplayMode": 2,
+                                          "PageName": "修改报工",
+                                          "LoadBindingDataOption": 1
+                                        }
+                                      ],
+                                      "ID": "0b8c60e2-25ba-47a7-b83a-71631bdcecbc"
+                                    },
+                                    {
+                                      "CommandList": [
+                                        {
+                                          "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+                                          "FourStandardStyle": "warning",
+                                          "Message": "只允许本人修改"
+                                        }
+                                      ],
+                                      "ID": "63bee85b-0f07-45d9-a65c-5a369218c271"
+                                    }
+                                  ]
                                }
                              ],
-                              "ID": "862d965d-bd15-4951-a0ec-0ee42999e7e5"
+                              "ID": "18daecc7-5832-4411-b5db-a8a0572a4bec"
                            },
                            {
                              "Condition": {
@@ -154,14 +194,46 @@
                                      },
                                      "CommandList": [
                                        {
-                                          "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
-                                          "TableName": "任务工时表",
-                                          "UpdateType": "delete",
-                                          "ShowConfirm": true,
-                                          "ConfirmText": "您确定要删除吗？"
+                                          "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                                          "ConditionAndCommandPairList": [
+                                            {
+                                              "Condition": {
+                                                "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                                "param": {
+                                                  "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                                                  "cellLocations": [
+                                                    {
+                                                      "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5"
+                                                    }
+                                                  ]
+                                                },
+                                                "value": "%CurrentUser.UserName%"
+                                              },
+                                              "CommandList": [
+                                                {
+                                                  "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                                                  "TableName": "任务工时表",
+                                                  "UpdateType": "delete",
+                                                  "ShowConfirm": true,
+                                                  "ConfirmText": "您确定要删除吗？"
+                                                }
+                                              ],
+                                              "ID": "dd66745e-3079-4b1e-a24c-74052db9d02b"
+                                            },
+                                            {
+                                              "CommandList": [
+                                                {
+                                                  "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+                                                  "FourStandardStyle": "warning",
+                                                  "Message": "只允许本人修改"
+                                                }
+                                              ],
+                                              "ID": "75abf162-1e13-42b9-b4b1-43721ce3427a"
+                                            }
+                                          ]
                                        }
                                      ],
-                                      "ID": "b18c7c66-04a5-4aee-9554-d059ae57095a"
+                                      "ID": "60a5766c-f611-4ef9-a8d2-479b91179e29"
                                    },
                                    {
                                      "CommandList": [
@@ -171,17 +243,17 @@
                                          "Message": "该报工已请款，无法删除"
                                        }
                                      ],
-                                      "ID": "13fe08a5-9bf0-443e-9f58-5272c17a4d5b"
+                                      "ID": "8c77eeea-4bbd-425e-9e7a-3294029192df"
                                    }
                                  ]
                                }
                              ],
-                              "ID": "782f89ba-47a8-4d4d-9084-c16564c098ef"
+                              "ID": "25256465-073d-4415-a85c-654df88c1b34"
                            }
                          ]
                        }
                      ],
-                      "ID": "6401e3c0-773c-48c5-9373-518b16f9a512"
+                      "ID": "8f70f78d-762a-4442-81dd-08154d756e21"
                    }
                  ]
                }
@@ -203,6 +275,9 @@
    },
    "2,1": {
      "TemplateCellSource": "执行内容"
+    },
+    "4,1": {
+      "TemplateCellSource": "执行人"
    }
  },
  "StyleDatas": {
@@ -249,4 +324,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//vnMWeebkuoxE2rC1EmCTZ1BhVdDDkivZgMTludzFgM/6lBqttjMHO2+uA8D3tOII7kzgqQE39FljARNh1hzt0NyVXKWrDe6hfJpXlklGR7ZDwEsa+4vavPCfW9tmANoh1RXPiehCyqyYWv3U4+xzEglN1HkigBhox1o1TpAgU0bgDoB/x97ruFmUBNFnI8pUk8aAirthRSyJ53n5lSeDLAe62/6o7zrpHOVZN4/D7ZcJ19tZ6/4+NExyheGeEHrun9BXPCPoKzo9DWtZNdM9NhDj9LmRrKR9ych3f4pN5Qmz4peFLck1n+OIT3ou3CzmH1+4ArZRQo5WpZVuiW75jKIPt80xwFH834dbpvbi29FwrctSSvOrDnFQ7nwbSkSEDpBnBtFSfsKax7aWjSkoFE5kbuYeo1SojO4vDWn2y1CQE+Uje++dwlI434VIrBIbETFKzeUEOKQ5Dcg0Eaw2k5DEYQWnDXasvv3hJPUHluwaB9WRWrS9oUog5KHMmPhtW5DucRWYhkGBIrHKMqgZpLrsazK0oqRIAkiLDxM4XrT2ciagGQ/ZRDmqnlkheaL9pggJcvWhRtaDxd1kfdgKPn00pbve7qcE2mlSKN38Lt4h9tG8OYIJnawblrh51kgzSRdw5ObI69K0/StH8inpwIatBjMfYYNKzVItGrEUVf9uMjfA3x+9vxx8FgiKmYp68uGXhhkFN6NzRCz9C8DHStB11wpaYXakX/PQOdHFi8wrf7uP8pypM+WvXXsyKIT2M4SPNRHbj8Bf2k1fSjlJniaku4gtahspznLQUYEJdYERF2nmLT1W2AUvNcZijmd+LJe5xNTRPhORaBk4LxIfKZsDhZFRCRjmDDha2Fw8nB50oBGSVoPcttjIONklhOQnHx4Ut5YbxsDen3XjK4lv7g==|920
+}//E+4iZBqqNggM2i7IyLzCMpz1tLY2ZdaMO72+OT9erRU6Z3sBom1d3r9HBefey6pnOX3+MzZeQmZO2GXs9vhhX7Jos6796M2gWCwOJ45JEnzoXGFZVAqpUkGmH8+6Hzh+bz597jnGdaQ5AyeYydPARVLhGh6FZ379VI/geeQ2YHjx6RNzoclPMCRgLyIB7hyBVuD2GdM3bglfoHtAvjShS9RrkIV2W2uLAfLXsGqZ0OOJzlFoKCNrIl9KUYzyT8AcC7f/OsyrUtiTjOO5I97EI7QgHSc7gd0qURnLU9KJs8LaLAcQtuWgKV9TrRPEnmzCaOtwF6fMbaHUAgHvbCSfYPDsgWRsy9HUF9msF3GGLi7ywaz5qrTy6CK5LsM61kc6o5F1rf0rQj7C4Ah0T521mtQEUag6LHGaDL7RyHe97Cuo5aEZt4bB5qk9aArZWERebISu1kKrlme21CCzz7YzgNAmy9SEK23tOB2/pqwMw2n/rqrzuEeFhmhES78uLJILgUj/TR/E7C7EquNFXKK2Jv7qYuB1kN64RApZnWP0KwKnPkUz5B7GWn0Yz1UctiqddXKuPgPtCVtjqdaB1+qjv0UXWbfGUT2dY4x447EOSGueis9rrQq3RbXK0q1AuLYQrdkihhya3FMa9vtdk+2RBCFgf7KVRLYx7SnM5jY/QteLCrkD9H/3fBNbPS2NjDkkZPdjs406Luzh31tZbyRZsBUttHVjo9PksCDEP0apdFtjv1Gk8J/xMNUOhL4Ux0G8pFYH9BdY/d8QBJBUIfdU3cBim6dkjChB8WK5YWraw69fMDDnSm9hFhAe+kq8g/h56vjChaEiyMWYtPsXSj/BVZidf2LUmus316GyjhydvxOwnISO1yMDkniFVdboWnZyvB6XLVsC3mj9N9ESbBTMpw==|920
--- a/Pages/36d33d0079644f28b16bd0fec90394c.rd
+++ b/Pages/36d33d0079644f28b16bd0fec90394c.rd
@@ -1,5 +1,5 @@
 {
  "PageType": 2,
  "ColumnCount": 4,
-  "RowCount": 4
+  "RowCount": 5
 }
--- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json
+++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json
@@ -145,7 +145,7 @@
                                  "LoadBindingDataOption": 1
                                }
                              ],
-                              "ID": "467a9037-3731-425f-830b-e12f039309df"
+                              "ID": "9cd963cb-ba13-4807-9e42-48c19a875640"
                            },
                            {
                              "CommandList": [
@@ -174,7 +174,7 @@
                                          "ConfirmText": "您确定要删除吗？"
                                        }
                                      ],
-                                      "ID": "9af337a5-a015-46fd-9efa-fe846a7fc91c"
+                                      "ID": "3b000ffe-71c1-48bd-a792-b53329c97c8e"
                                    },
                                    {
                                      "CommandList": [
@@ -184,17 +184,17 @@
                                          "Message": "该报工已请款，无法删除"
                                        }
                                      ],
-                                      "ID": "93448722-1c18-4368-ab73-5c3f9b3946e0"
+                                      "ID": "146f8547-9980-450c-aea7-b218f818168e"
                                    }
                                  ]
                                }
                              ],
-                              "ID": "85edc3c9-90e0-454d-8a21-1e9e5b9bcf7a"
+                              "ID": "4cda89d1-b801-464e-b2ef-1316283d2a33"
                            }
                          ]
                        }
                      ],
-                      "ID": "d3348302-9a7c-43c2-ac71-43a254e89139"
+                      "ID": "4ffabca2-7099-45df-9ca3-303951f6e498"
                    }
                  ]
                }
@@ -262,4 +262,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//Af283opIP4RPq8jhmUNOnY+w5X/xew7jOgxSoxLNV7UFVPLnFTInpV49XzBN+LWBIWks/aikF8otLCxsouc1lJcjk+4/Xzb8FV1VK/jOySFnUXe8+QQCak3W/+UYK++Uh3fQvvqVHLVbhUznexpJ7IddBzxRoVg3/eyYDwP73arwpuliip9wLqhk0IHPqHINcvdtDnJUIf4kVd0CPMEgE0uqbfF1wCuLPSPysFvvZsHQlho05rPWdFQb21p450c1DjgOQGgu2uV2+YQw5JOyIqJBmM4aN/Ux2d1e+ZE9cMT/l/VZUn2QMT1yatVCylddLXNR0NrncknlXYJvPjdSwTOS61uvekN9aOivCxmCbKQBddRDeqwbUo8UwYahpOLkKX0Ag8L+zLoE5vp8Qh5O/n1Z451us5J3cEuf/CQmByhASmbcDLdxQenZZl766YPKWoFmbYBSfdcUDfa/PQmqEwERNaMh1PSPrsAnfpncvul2fGOuXHtqaaSiDFxmiPhYUDBRNDB5C+vLScziY9RVSY7oMiQcrAWzNoXBQfPj9V979PIV0RVkcOxOaJnF2fW1XGlYEPaNNYv9IlPlH88KBVxJGM1A+4Fos+rT09nSDC1tX0ugWbi6u3ggR8iEvgqzm24gLc/ckMy/LTU7B2zSRjCfdcb6fDk8QtDb8OqBJtFHLUd6ke9iMqLX4IbYuwZRoypxfdMZHUGVvybbIqj0OfHknghxD+J7wOs3+4erL4UI+mLIL6ds5aMWVli4J92GiWEYeO7K19mBZuFLDa5BuXd1GTD8LTUCPTU+3VOKznxtGuPIVVCfqqmp7lBuF/RoIGH5zqf3FheAxru8pS0YDIM8yOsfoA20DvVR4Fy+isNpHZRpo7l62WlQFXGEyA0k8QKtbrkL16fiDZ0Y2nKd4g==|920
+}//PkeLpoAEU7agj9l5Ca5oyK3S/24fvDlr7uJnYRs+O8dbkJu+AADS3GrIS8e4+YTp46PF5P+Yk0DTpI8u1KaOdWDSvtjmptoTT4XnPArBokxePVXUjVTf8HIKq9Lm2TV1qrQnxPK2PGdwcqJ8VujKYEyHnTKaHhlCJQUzL6AAM5GUA9+GR6r6pIRLxt08JM4KJCdSWSG8C9dCAcLBbY6K8lS3TPjnVxwKRfnf/PSsSox/Bv8MaGyffBm+Ei2rfjMSNCy9S6+zGa3cAp6x4mFR5S+8te+iaGFRnAbY2fA+nc1HPX+y+dmJ75QDTw0uISV7kvEiTQVck5jn1h386Tli8XTkzTtZxxJ4FSGzmcz2n6DL/Ke5vAjzAO6IxyJoXa12NXPDh/NXqijI/CHEZoZga8EI/rTnc3XeHtbFHiXI5d5grCo8hDDwl8W61Bq6yQ/OOKTrJ33UhUBcbyrA4z5T5uZFcahSf5HLzjuI7iXrLh1DZbUx8DmwXZFheiv8Up/8FCzRNS5EVcUEG3qmlQ4CDareervJzBVqmvERCg0FEwajoOFlhcaMWDVjTYPs79P0ZuCbB6Q8PYvCEaLpv4pjlATT19TbeqP1voqvk7mFQjVJRFHBMSM0xM4jsm6aCqz1yvGZCPRWvpRZIOF8oPAW5pHNMnGd5flKlI6ehtH0rWPWJWnhOPz7BWJdTN+oszbZ9PPqzNxKpwVBQVUkdb5+9PRPglu2g4Hf5L3O+NbxSi4JCv3x+4yTRLP78J39n5v4imQNbhIuGWdxokbAwVScmHBnk4XkWtR/iz/Qi2kvJO/CEq6r39HkrihM+vrsKPVy5qnwNBAw3DM0mrw9pe8wH7iujbOwxlg/vrTbm6ARZH6C4Gfg53XGsosuKff+KaNhVDkucRWmkHJSCwHHnfjY+g==|920
--- a/Pages/项目/项目成员详情.json
+++ b/Pages/项目/项目成员详情.json
@@ -259,11 +259,15 @@
          "matchMethod": "contains",
          "loadingText": "加载中"
        },
-        "noMatchText": "无匹配数据"
+        "noMatchText": "无匹配数据",
+        "IsDisabled": true
      },
      "DataValidationInfo": {
        "IgnoreBlank": false
-      }
+      },
+      "RulesGuidList": [
+        "68ec1254-efa7-4623-9ca1-84a1e58629df"
+      ]
    },
    "5,1": {
      "BindingInfo": {
@@ -441,17 +445,17 @@
                                    ]
                                  }
                                ],
-                                "ID": "3f8dd57c-d384-446c-8d22-6aed78c64d3c"
+                                "ID": "25ceb69a-0fb9-43cd-847f-b7d93b20da5d"
                              }
                            ]
                          }
                        ],
-                        "ID": "ff9b50a3-6172-4c78-9820-a54fc436d193"
+                        "ID": "66905bf4-6a2c-4925-96aa-ea370f213b05"
                      }
                    ]
                  }
                ],
-                "ID": "f03e2a2d-0e8d-42bb-b7d5-2f3954ab3888"
+                "ID": "eba607ee-1500-40d5-a367-c8898a8bdb62"
              }
            ]
          }
@@ -701,7 +705,7 @@
                                    ]
                                  }
                                ],
-                                "ID": "43763056-035b-4668-8545-65c38306ed9b"
+                                "ID": "854b418a-1e74-42ad-89dd-4603b7dcd3a1"
                              },
                              {
                                "CommandList": [
@@ -711,12 +715,12 @@
                                    "Message": "请不要重复添加成员"
                                  }
                                ],
-                                "ID": "59458a1f-219f-4c75-9f26-820e811be36d"
+                                "ID": "e6ac2f48-b433-4467-8c06-3b9ffe84fbc4"
                              }
                            ]
                          }
                        ],
-                        "ID": "317396e2-5d07-45c5-9386-95f163e66a2f"
+                        "ID": "b7d96937-a9ca-4d12-8a09-d8ec2e245f87"
                      },
                      {
                        "CommandList": [
@@ -726,7 +730,7 @@
                            "ShowConfirm": false
                          }
                        ],
-                        "ID": "eef385a2-8806-4c67-89ba-089a7501f43a"
+                        "ID": "5476c2a9-d728-4c92-a399-46a84caba3f7"
                      }
                    ]
                  },
@@ -748,7 +752,7 @@
                    ]
                  }
                ],
-                "ID": "6f365729-65f1-432b-a6fa-1e26266e6b85"
+                "ID": "5670df82-5883-4905-a81c-aba565c010a3"
              },
              {
                "CommandList": [
@@ -758,7 +762,7 @@
                    "Message": "请指定项目"
                  }
                ],
-                "ID": "46382263-7363-4a12-8307-6f5c8c2fa485"
+                "ID": "4ebfc3c1-ff9a-4c92-9052-e9600f956226"
              }
            ]
          }
@@ -1051,7 +1055,26 @@
    },
    "RowBreakLines": [],
    "RepeatRangeSettings": [],
-    "RelatedDataTableName": "项目成员表"
+    "RelatedDataTableName": "项目成员表",
+    "ConditionFormatRulesCollection": {
+      "Rules": [
+        {
+          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+          "Formula": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=ISBLANK(项目成员详情!ID)"
+          },
+          "GUID": "68ec1254-efa7-4623-9ca1-84a1e58629df",
+          "StyleInfo": {
+            "Underline": null,
+            "Strikethrough": null
+          },
+          "IsDisabled": false,
+          "IsInvisible": false,
+          "IsReadOnly": false
+        }
+      ]
+    }
  },
  "PrintInfo": {
    "PaperSize": {},
@@ -1071,4 +1094,4 @@
      "Formula": "项目成员详情!$E$20"
    }
  ]
-}//5NBrvpQLbb1Qo9Vq+18UAn1zsAAuUvsSh/VUehFHw671SgkJCg+WyXdJfznMehVDOKW2CoAPAd+0DvBls7yIO8DTX+q+kJCf92vC/3yip5g6wp5CxmB76ELIRLAJ+2eHl9tkEmk9jOVYztjPN3pEvnJkIKyChblpZL6KDoCHyrMIM0cX3BQyLx00URR4i+q0hMPwBRGtAL3bWwcBE9mQuILoh8m07SF5o+UeyiaM4qMcAJ8z08o4iZMkFsb5dlnMvEINr9yuOX+DyrQz5HlrQnfjBBSqB9iyEGShR8cC2rTxM75wUQS8A69ecSSRAU1GegamF59RbTcpat5OsCRDQa0ZtW/77k1HWE1bgYLV+PYHPRrnzPTgem8RGJD5bo1QKM4AQMKzMSZcblkNRWaJTi8/r9jHTqJdf7nHL7qbdTp8XiYV5ZzdV76nOyzBWLKbfxlioGu9i+7eMN+j7Oiq6fCwkLu0T6DTwKgmnLALMKx6MLitp//eafadVqtFk1umYFTna5xHmvnFId4uk5rD4HatQdCPYMU5OfOfZAHHKmZ7SxVR4SV8VQ0sTbB7nHRXmguisqAA0jCM2qdaC2BmBEBayMxKzV725SjtjUFQqTLzJ414RX4tPJ/6QoTywregFk8+uZOhgwZpkJE0M4gxToi9qXPz6BnlyDTA3eZzbDTcdwsvgo2hkEAHQ+ko6ogFGFuajh46FB22QcMqM8bZ5YhofWdHcdJqr6sIS4CPDUe/7f98iR80XFaRfn2eJPKOLXpJXORnLM4JRM+Mn8GVwTdrXYRN3DVN2nQwcq2mESNR1oaosnq0+klcVD00z6RMoVKtFqkc0+wQoLvmgZo1s8whfW0axw60XXt4X8JCTifZIn1K99ZLSrdDK4CRjRBwkxbdlvOvatjA/ZPgoG3Z3w==|920
+}//JQHu/wAhwqt8gohbUpxSO8SF8ahDCfiLMIF/dXwUa8t3cGa4xmq9MRrBMFBicLtkgQPslhSkwuTk06YWSByDW6Bfsv3rH99GEasHMATkph6TLHJirmsrB6hp4wkmHm08l5412KJETMf7bLTQpjSzqOOegw7jpaIFdPrdaQaTJ1nt+ugPtsyv5A8vpoBbfvryoqh0baOYJfbjCDo+SrxJbDuReioLByKI5ME/xTI09CEGEKZR7fMt0NbPQLefqZrNebt9Rs872sKu1VHhV457mXl4G/SvnPAVKztK5bDWQfJ7nU8Hgeq1/t+glCNwmCkRATntaHNdDMKsHnJq1BvoKsS0VbdemtNvuM7RNeP7OaiZMx7O/oyiFrmQ64qJbH4va7bYLIaGRLJo9EHi4uiK8nja/7/C4khKxU7NcamJ7o4fGh92mVUvrhmMyyGkcIxTkIOzNMU2/o43noPxpx6hhCPvOf1RQ7zclEq7krGo7kC0ArmbCNnJglVKkZxt0UxzTzVa6nfXJbX4Mltni/fdGduNiqRO8jCQray0ZssNjJuRChSiu0LRrEe4Ikpxw/YzS7NNZwYip6atLYJiYQDsfkzvAL7/Fi85G6yvaWgyBeUnjHnIrwiNmLNpW3kDs3x5uRqf50K6BtRjtvDXijSotQljL6HIOMZhV9Vt7Aw0WKNeJV/S+C6wCqmCByIvwYDPhHJrFBkFL5as8+ZabejG2HmJZamHGFI+mFd6zbfoiL6BylHSXOb9TdIItiuQEtVbQ3jISqqhU24RIuXksFniQrSwpVNX4CQRy3M735s/sNHJ88ACG9Undg486JbQLXfEIZsGTtlFkw9VFReUJtiREnBQKEcdlYbyNjiGgYUjfXj3t4GU+Jz2jHNDnfuiDGuhAq6z2X4VRDplhESu4ihLAQ==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json
@@ -193,7 +193,7 @@
    "1,20": "实际工时",
    "4,2": "计划工时",
    "4,20": "计划工时",
-    "8,2": "实际工时",
+    "8,2": "核定工时",
    "8,20": "实际工时",
    "13,21": 1
  },
@@ -336,7 +336,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "60c32cca-b06d-45ce-93ad-778ec1f341f7"
+                "ID": "49e708c6-916b-48b0-a1f8-958b01c35a81"
              },
              {
                "CommandList": [
@@ -375,12 +375,12 @@
                            "LoadBindingDataOption": 1
                          }
                        ],
-                        "ID": "1be7e38f-1335-49da-a9c0-276cf671bb23"
+                        "ID": "a792d097-0c08-4701-8e0d-411362f4ff73"
                      }
                    ]
                  }
                ],
-                "ID": "7091111b-fc24-477f-94b4-f92431f118b4"
+                "ID": "ae4cf9d1-058d-463a-828b-6c2cadbf64c0"
              }
            ]
          }
@@ -435,7 +435,7 @@
                            "LoadBindingDataOption": 1
                          }
                        ],
-                        "ID": "7d0e39d6-7b1e-4e15-8a58-c09d01fc5d63"
+                        "ID": "35918542-e8c1-4b52-b966-5793a67c9252"
                      },
                      {
                        "CommandList": [
@@ -445,12 +445,12 @@
                            "Message": "你尚未成为该任务参与人，不能报工"
                          }
                        ],
-                        "ID": "2c7a0a8a-aa77-4115-ad6a-5c1d30075ee8"
+                        "ID": "790fa5d4-6bbc-40c8-bd48-ac184c38b6ea"
                      }
                    ]
                  }
                ],
-                "ID": "e8f676b1-292d-412e-992e-6ef8297eef79"
+                "ID": "3afa29a8-a1a2-488d-91ba-41e93bc393d3"
              },
              {
                "CommandList": [
@@ -489,12 +489,12 @@
                            "LoadBindingDataOption": 1
                          }
                        ],
-                        "ID": "68ff040c-1bc4-43ad-9fb6-766221b9b1b4"
+                        "ID": "78a10f1a-452e-422f-9eee-571d4d3ed770"
                      }
                    ]
                  }
                ],
-                "ID": "bece63a1-eec8-498c-94bf-e9a9950eb842"
+                "ID": "3e10da9c-186d-489e-9470-7ae478bb477e"
              }
            ]
          }
@@ -511,14 +511,14 @@
        "IconSize": 14.0
      },
      "RulesGuidList": [
-        "b34ba4af-48de-4a25-8bd8-ddc8ff3e714d"
+        "c99004b8-fd01-4070-8a5b-bb83f727b4f3"
      ]
    },
    "8,4": {
      "BindingInfo": {
        "TableName": "任务平行视图",
-        "ColumnName": "本任务实际工时",
-        "GUID": "44b3e8bc-f0e1-4877-b4df-6f80e4b1e7a9"
+        "ColumnName": "本任务核定工时",
+        "GUID": "a80d4c74-1a59-46c0-bd2c-c250f5ad979b"
      },
      "CellType": {
        "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
@@ -547,7 +547,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "ff3e2755-7fb1-40f7-ac28-5a587ff6cb48"
+                "ID": "675bc634-8a10-44e1-8995-586748cbabe7"
              },
              {
                "CommandList": [
@@ -586,12 +586,12 @@
                            "LoadBindingDataOption": 1
                          }
                        ],
-                        "ID": "5862701f-9913-4644-9188-a709713a985f"
+                        "ID": "cd1fbe90-4f97-43d6-88ab-1181ee0453c5"
                      }
                    ]
                  }
                ],
-                "ID": "4b32ea75-1c1e-40f8-869c-084dbd38520f"
+                "ID": "5be9b8f6-749f-4f6d-ac52-5320f12df03e"
              }
            ]
          }
@@ -671,22 +671,22 @@
                                    "LoadBindingDataOption": 1
                                  }
                                ],
-                                "ID": "93740fc1-aa70-4d4a-b728-1df934d53e8c"
+                                "ID": "1809563b-4191-4d5d-91e1-04102d6c4b48"
                              },
                              {
                                "CommandList": [
                                  {
                                    "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
                                    "FourStandardStyle": "warning",
-                                    "Message": "你尚未成为该任务参与人，不能报工"
+                                    "Message": "你尚未成为该任务参与人，不能报工！"
                                  }
                                ],
-                                "ID": "fc86eb26-e4e0-4827-a663-e1a59adaf0a1"
+                                "ID": "3207605d-795f-4cb5-b0ed-214e138181d3"
                              }
                            ]
                          }
                        ],
-                        "ID": "ccb56027-7564-422a-b3a7-f3cbc996d8d2"
+                        "ID": "8e3d36f6-d439-4851-a94d-51f80b149446"
                      },
                      {
                        "CommandList": [
@@ -725,17 +725,17 @@
                                    "LoadBindingDataOption": 1
                                  }
                                ],
-                                "ID": "a636a26b-895d-41d6-9dcf-42508c9a65f1"
+                                "ID": "67a194bd-0848-4f92-9014-d7e82b11b36d"
                              }
                            ]
                          }
                        ],
-                        "ID": "2e6c078b-dd61-48c2-8709-53e508a444c9"
+                        "ID": "0fd93f69-4828-47f4-be62-413f04d7261f"
                      }
                    ]
                  }
                ],
-                "ID": "d610214f-2743-44d0-a9ad-677ef7528134"
+                "ID": "6ff0d3ef-59f1-4a1d-b694-3607a106118f"
              },
              {
                "CommandList": [
@@ -745,12 +745,13 @@
                    "Message": "当前任务状态，允许上报工时"
                  }
                ],
-                "ID": "a8dd2400-89a3-4e3d-ba40-bbaf5c9eae58"
+                "ID": "bfdcfb3b-a104-407c-9fae-687ec023522b"
              }
            ]
          }
        ],
        "Text": "实际工时",
+        "IsInvisible": true,
        "TemplateKey": "Gost",
        "Icon": {
          "Name": "Application/005_add_5.svg",
@@ -759,7 +760,10 @@
          "UseCellTypeForeColor": true
        },
        "IconSize": 14.0
-      }
+      },
+      "RulesGuidList": [
+        "3f43eea5-2c34-4fc7-a4de-03e475465fec"
+      ]
    },
    "9,2": {
      "CellType": {
@@ -828,16 +832,25 @@
              "GUID": "d151989a-5eb4-4ce5-85e8-ee2caa82a3bb",
              "BindingInfo": {
                "TableName": "任务工时表",
-                "ColumnName": "工时",
-                "GUID": "7f4bd192-b050-4ac5-9317-3b4ba4aa534d"
+                "ColumnName": "上报工时",
+                "GUID": "ad174679-2cc4-4789-b890-bd909f0dcb46"
              },
-              "ColumnName": "工时"
+              "ColumnName": "上报工时"
+            },
+            {
+              "GUID": "a64e2423-13ab-4c45-91f9-3ea366d5d3b1",
+              "BindingInfo": {
+                "TableName": "任务工时表",
+                "ColumnName": "工时",
+                "GUID": "d64fcbc6-88c8-4e6b-b8c8-30fb30e48698"
+              },
+              "ColumnName": "核定工时"
            },
            {
              "GUID": "f31b2d5d-3f99-42f8-8c17-80adabccd9f3",
              "Formula": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "='任务-工时'!执行人&TEXT('任务-工时'!工时日期,\"m月d日\")&'任务-工时'!工时类型&\"工时为 \"&'任务-工时'!工时&\" 小时\""
+                "SerializeProperty": "='任务-工时'!执行人&TEXT('任务-工时'!工时日期,\"m月d日\")&'任务-工时'!工时类型&\"工时为 \"&'任务-工时'!上报工时&\" 小时\"&IF('任务-工时'!核定工时='任务-工时'!上报工时,\"\",\"，核定为\"&'任务-工时'!核定工时&\"小时\")"
              },
              "ColumnName": "描述"
            },
@@ -976,7 +989,7 @@
                    ]
                  }
                ],
-                "ID": "9c85a4b1-9f0f-4096-bbd8-24e05228308f"
+                "ID": "825e4708-e427-4ebe-b71b-10af82a9084e"
              },
              {
                "CommandList": [
@@ -996,7 +1009,7 @@
                    ]
                  }
                ],
-                "ID": "f13a17d6-1a89-437b-b72e-3bdcb461d271"
+                "ID": "721344de-fb5d-4d18-a87b-29dfbb2e215f"
              }
            ]
          }
@@ -1248,10 +1261,10 @@
          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
          "Formula": {
            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-            "SerializeProperty": "='任务-工时'!折叠工时详情"
+            "SerializeProperty": "=AND('任务-工时'!任务状态码>=2,'任务-工时'!工时分配方式>=3)"
          },
-          "Priority": 1,
-          "GUID": "f0252303-f510-466d-ad62-b3d710deb5b4",
+          "Priority": 2,
+          "GUID": "3f43eea5-2c34-4fc7-a4de-03e475465fec",
          "StyleInfo": {
            "Underline": null,
            "Strikethrough": null
@@ -1264,9 +1277,25 @@
          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
          "Formula": {
            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-            "SerializeProperty": "=OR('任务-工时'!工时分配方式=1,'任务-工时'!工时分配方式=2)"
+            "SerializeProperty": "=AND('任务-工时'!任务状态码>=2,'任务-工时'!工时分配方式>=3,OR('任务-工时'!父任务负责人='任务-工时'!当前用户,'任务-工时'!任务负责人='任务-工时'!当前用户,'任务-工时'!项目经理='任务-工时'!当前用户))"
          },
-          "GUID": "b34ba4af-48de-4a25-8bd8-ddc8ff3e714d",
+          "Priority": 1,
+          "GUID": "c99004b8-fd01-4070-8a5b-bb83f727b4f3",
+          "StyleInfo": {
+            "Underline": null,
+            "Strikethrough": null
+          },
+          "IsDisabled": false,
+          "IsInvisible": false,
+          "IsReadOnly": false
+        },
+        {
+          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+          "Formula": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=AND('任务-工时'!任务状态码>=2,'任务-工时'!工时分配方式>=3,'任务-工时'!折叠工时详情)"
+          },
+          "GUID": "f0252303-f510-466d-ad62-b3d710deb5b4",
          "StyleInfo": {
            "Underline": null,
            "Strikethrough": null
@@ -1346,4 +1375,4 @@
      "Formula": "'任务-工时'!$V$14"
    }
  ]
-}//dpaOgagWptnC10f1HPhZI3fg4jCPa7s+BdnT0S6JPb6OT/4rdV7Q2Xlc52VXd2sGOrUDU/zw3GuaKpd12pRJNJNAm8b1Dzpv3HnbBngbIUkq6pImu3aaOU7d+m7nRSc/E3KYEE5/gT0qzNXynvfI8b1KAHWXjLtilF1Y/DoC/JzuFVnPvjvPR1y43tu7X1nfENKWF5+AFlKWqdOKPtxZxJPlrMZrXOSnpgMJRpGwiE4rtcEwwAl3GAdDlPQb0NOlkN1+sB4Luj2NOmFKZfkdTK3vktqoHUKQDALHu2LUgy87A1fUzsRw9D12fEkzHQveQoubn7gdCOKey88zG5z844/iLQD7qoXJzEPQzns0GQQPQEnrlMEfQA53QAhAMqMZuhn/fuhUFZrRnH6Qic7POUAjDUWPF2XggkwT7PfYL4VWAMK65zx12sB0BVwxJLnjmIjQ4X61M0l6lrEglCywtRJd2Mqa236XLBsSngKJr0PGkvjhRLiwbTj9VEeeVbB6/vHBK538MzBeMaVYJcZE4vvxh9tRGHQhjDuQLqucfBVKb1TTdLO/1AGdoRY/6UyuzfhdZdQjMIC+O1DfL1a5Ip2AbwGxnLeH/dwoYz23JpqUAu06C32S2vOYhmGK3jXisiF3B21Mrj2VJ+l2jtHkbYIfKtE52G3WFEFXwJCYJVyYnJFAViFc2Nb9fV3K/jmCTjoHLRGepUwkVH0a/9FKjFJPna3TOn9+d5P9BYJaHOdTopPQMVAuAN4iT7D//Qqwf6p7FM2ocAC7AZDmwdmuHgC9SZoQSiitXTVACeED98Du/z3zDkv+mUAwFF8mOmnsCEjV/A80Ni1w3UanKxqF4hlVREjfVkBz9ZO2w49O4JDSjQ3hEdUtXxRWOsFjONPUHAfyCnUKzep7OL7W9NL85Q==|920
+}//RBTmqGY1ZwTumK3PoUva6bndbB9WDISg8IanQxDlqQamdOxKDz45X6084aMX9rfFaiBdcFrO66+FCDsIXwLbcRhmu4Pxgp9vjXjQtp/bXQV2KJ3izQVL6qgSHN8B6altIuLUEUSNBPvuo2D9t8CdgP7RhuTddrFGnAEVXrWZwQT9Wq6PVoNmtZPR2ay7SewjCOBtrCwoN+7vZ5wT0WSX+YIeERVtnHC3bQ2lR9pZVhnYqGU7EYX99ZkA5cQwKSdBJ5Xwl7ixga8npDryU3JJLaQr45dzQSKz7RSvIkKDuY29vlI2tr3ZhPvpjW0/hTs8gpH5cKepr1KKq3i9zBvxgZeoFg3QRoDASl6AMdZg9J6h0pPaEtYnaFIw6JeGEB8X4OsgL5QhCfZJUCnz410qM7ubuM4QjZprBSugUNotebGTlZt3+2f6EszUEeMKL1e0zA/vkvHh+fOtyryldKYJ4iHb0X0v+ZwUrIbTk6PzTIzFc33rYZPuVy4LQcTeq+f/yZ8uXAjRlrKqmg7mrnpXSrOZ5H5V27/vi6WuR73UCySGE83k3G106z0yUSdoN4twl5nAM5zHSBktwB9oO4c4C49yNCivgClzhR1hnSx8KXl9tSoFa1VmhBxDnZUF6GclsWS+OorE/bgnoaQ1FtgAMmAlYfwQrKR1FSoU/D+T14gMgZMsGTGLzcJ3zejEZaCNojw7kQHrzPezSQtBXp6gzqmFlu3L7h6ZdXjuYmF2wwHiqZMY+JB/O8Ed0XcN0xq74M5nUQZ+JErOv8FAZbl9INDVqAG2gHH4Ny4rXyzaP8SkMdKb1PMLRWwcoY+2zqlOwm5aCbLDJ5o/Q9+wR8HwRNlPJiWPMJmhX6DnMRWXwecve5KC6Wp7VR5elRh/d+Mnccdfe05ndGqKu9y5vprcog==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json
@@ -223,6 +223,7 @@
    "7,1": "工时分配方式：",
    "7,7": "总计划工时：",
    "7,14": "参与人数：",
+    "7,21": "任务负责人",
    "8,1": "项目名称：",
    "8,7": "项目经理：",
    "8,14": "任务状态：",
@@ -339,7 +340,7 @@
                            "ShowConfirm": false
                          }
                        ],
-                        "ID": "080cc3d7-c496-4fb9-850a-7934a1c21225"
+                        "ID": "5bb5bece-e5e5-4c39-81f5-49701c8f189c"
                      }
                    ]
                  },
@@ -403,12 +404,12 @@
                            "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
                          }
                        ],
-                        "ID": "f98bfe52-ddbd-41f9-8599-503bce6314f8"
+                        "ID": "976139ea-7a39-4520-834c-e792e43cab11"
                      }
                    ]
                  }
                ],
-                "ID": "bbf7de3e-cc41-4f77-9caa-dede26829599"
+                "ID": "46118012-fb32-4170-b7a9-46ebb620d102"
              }
            ]
          }
@@ -456,7 +457,7 @@
                    "ID": "e2e848e0e72d48229c97757429d446a2"
                  }
                ],
-                "ID": "fc345220-28d1-4a49-9c63-285b82026208"
+                "ID": "79c56612-e4c9-4d4b-a675-1a25caf651ea"
              }
            ]
          },
@@ -674,7 +675,7 @@
                                "MethodName": "Refresh"
                              }
                            ],
-                            "ID": "266d462f-dec9-4513-a584-5ee07f800d9e"
+                            "ID": "dfdb8fe5-1fcb-40b0-8c3a-7793d706ccfb"
                          },
                          {
                            "CommandList": [
@@ -689,12 +690,12 @@
                                "BtnText": "知道了"
                              }
                            ],
-                            "ID": "1b0917f8-4a83-458f-be28-d5792706465a"
+                            "ID": "8f5003ea-54a9-43af-b50c-7f0006fb1e7f"
                          }
                        ]
                      }
                    ],
-                    "ID": "34f97df0-8495-48da-9388-0abbe7d77527"
+                    "ID": "7249c42d-e6ac-4ea4-be4b-f561d9c9eddc"
                  }
                ]
              }
@@ -814,7 +815,7 @@
                                    "ReloadData": true
                                  }
                                ],
-                                "ID": "dc5cc33f-0ac4-4243-935e-a86551c815f1"
+                                "ID": "816062fa-3e0b-416c-a820-c6048b4136e9"
                              },
                              {
                                "CommandList": [
@@ -829,12 +830,12 @@
                                    "BtnText": "知道了"
                                  }
                                ],
-                                "ID": "27d4eaab-0fc7-4bb9-afaf-de5008c1fed7"
+                                "ID": "34bf04c3-223b-4829-99b8-c6e6c5deacab"
                              }
                            ]
                          }
                        ],
-                        "ID": "75df810d-9c91-4533-af8d-9520006c7225"
+                        "ID": "9b46f902-eebd-4cbd-b8dc-69becb9bd029"
                      }
                    ]
                  }
@@ -974,7 +975,7 @@
                            }
                          }
                        ],
-                        "ID": "8e113447-b76f-49a6-a1e2-a0a04b3a7508"
+                        "ID": "6668979a-c6f5-472a-95fb-9eeaf4910617"
                      }
                    ]
                  },
@@ -1015,12 +1016,12 @@
                            }
                          }
                        ],
-                        "ID": "c5f6abe8-8b46-435b-aa82-95c83d90947f"
+                        "ID": "b632925b-d076-4e49-b989-6d38bb211b82"
                      }
                    ]
                  }
                ],
-                "ID": "c8e5cf73-f044-4ed1-8042-2d0ef2d8d145"
+                "ID": "08e2099d-86d4-422a-9d02-dce966f9c0a9"
              }
            ]
          }
@@ -1081,7 +1082,7 @@
                    }
                  }
                ],
-                "ID": "764984f3-4674-4449-b97b-e1796b5f1fa8"
+                "ID": "6908e48d-047d-4613-a347-5c878a8594e7"
              }
            ]
          },
@@ -1122,7 +1123,7 @@
                    }
                  }
                ],
-                "ID": "0667eee6-b486-448e-8447-605e2acf5825"
+                "ID": "b914aec4-fa90-4c4b-8775-654fb2545687"
              }
            ]
          }
@@ -1237,7 +1238,7 @@
                    "Disabled": true
                  }
                ],
-                "ID": "5126c96c-7881-4a9d-b668-83bd11b4acfa"
+                "ID": "b1b50506-6c40-4f61-94a6-92c1490c2422"
              }
            ]
          }
@@ -1292,6 +1293,13 @@
        }
      }
    },
+    "7,24": {
+      "BindingInfo": {
+        "TableName": "任务表",
+        "ColumnName": "任务负责人",
+        "GUID": "63e84529-7a5d-4d76-a58a-89f2faf1cc6b"
+      }
+    },
    "8,4": {
      "BindingInfo": {
        "TableName": "项目表",
@@ -1729,7 +1737,7 @@
      {
        "FontFamily": 1,
        "FontSize": 13.333333333333332,
-        "Foreground": 11,
+        "Foreground": 6,
        "Formatter": 9,
        "HorizontalAlignment": 10,
        "BorderBottom": 1,
@@ -1920,11 +1928,11 @@
      "7,21": 21,
      "7,22": 14,
      "7,23": 14,
-      "7,24": 14,
-      "7,25": 14,
-      "7,26": 14,
-      "7,27": 14,
-      "7,28": 14,
+      "7,24": 22,
+      "7,25": 19,
+      "7,26": 19,
+      "7,27": 19,
+      "7,28": 20,
      "7,29": 23,
      "8,1": 13,
      "8,2": 17,
@@ -2017,7 +2025,6 @@
    "7,21,1,3",
    "8,21,1,3",
    "9,21,1,3",
-    "7,24,1,5",
    "8,24,1,5",
    "9,24,1,5",
    "6,14,1,3",
@@ -2028,7 +2035,8 @@
    "6,17,1,4",
    "8,10,1,4",
    "9,17,1,4",
-    "6,24,1,5"
+    "6,24,1,5",
+    "7,24,1,5"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -2133,6 +2141,10 @@
    {
      "Name": "父任务负责人",
      "Formula": "任务首页!$Y$7"
+    },
+    {
+      "Name": "任务负责人",
+      "Formula": "任务首页!$Y$8"
    }
  ]
-}//6czjRQrdNSagNWgSe2T6vQIuIGVwfCmWUSzZ6DaxOzh5CmKAbaPyoO6SKrluDyuVXfPRnABwem01apojALurGFkOim9t81n7Q9r8GPOyL4jk5tRIGxN6IiNLnz2K9Pe5p/W6PYsgcTngWV4pJEOF46QDn2F4Z5u7b4z9rYmAdhgy57IxnpzbDC9AXRrYPafdTGufsIH5yjQlHlKWqtXPrHysU+U0cYpQFsK6EVzjJAafaQYWPdNNfyplj54UT7W9MMo1olFbXqEAvLq4Ii2WU4vV3r/EcYn4q3Np45fgHncW3glmloXMLPR9LW2U1gZVEcDjj9bR1v4yLg7qM+PBEsLMea/A8WSaRvRla4K93JktWLnJ61lHOzZS7vuiPdMpBx8XZ1Razr+/Hx2izbXanGft1oeBGumnu19WQFXgWxQlBvZ9sSfxux+UUa9GCkr/crLFDBwB3SE/bASqCN96rhaMY2UwlimddI9AWyUGcNQt5gCeFogdIC5T0WS1slbXq17Oyhsf+tNsUhC9qLNTgubZ4XSHT/goFjwbi5EhroPF/2+qY4hXYnWZa4m2THL9FOivGpZLhGwvF7+HJJzhfsBnBpcG1mPSltht3F6vWaACOyE9FxZtmpKagSPB+aZ8INzyFB8Ze/+cnGdhKxT5k/NawzBTg8EcwddayQwhHfS5j6mdD5HWagItFnV9YGVdnsbmjBJCJ1Mk0x9mTYQLnG4czfJs3fXaELWDd0JaEpHItWl70U3CqA5TSToJzhXnlipCMm0nfYm2R/ulfqjzAssEJNVLbzJiB543NO1LVMUmUK8/AWnaDuAXmx1tZu17d431OYgFQj7tQE58mcTyvGYi+bypCyK0PLYbNL3zKofzf+XZ8vaHPQXBNmd0j9ptF/XDhE55idsQnnS5ckHgVA==|920
+}//wRf59OZbGPfNWKNS3bwNxnE1ZoQMzqjuj9qXdBHvLnrUmwv/u3vz5MgfGfOgXHmmq0Mlf/dLRX2EgVwi8lGhaWxeW3J+IzTnRQQ4om6tYTq6pnqrujTTaVbpJk/6qLUe3TpopbLb9u3ANek6qN6Soa6Vzp4gr09d3XDYEmNrZOtgcF2Mh97da0ix90aDupif9h882g6Po51D1tbAI5l5N8bCBBFOcwTj/zwaLcggyJbcJhvi96I8TzEZl1x7r3b2I9aOypBG4jec637/LSAWZYCqK1oPvPawnOLepdOYGoDFa1xs7gOP+CEnqOIJRwzcB++ADqFHEezzpQG+a4xIsEV24UN+jYShAq1b45d9RW7Wk6Fcgj8EmfQJYFAz1YMmSk2cYje9GIMWB8Ebotld59d0cShKUh2BciAMFt6y31sYu01jsc4qc8PT0jOoOLSQE+R48DF5oMdb/cJ+MSPXSZxGV+K68FdbxrKF/J2uQADqDincWS+uAQy/LxMhW3YFq04AAo8j4RyGiSnK2sSFLJSBr7Ij7wsAtfzSc1GjII3NFBbDTxfbbcnPz636PZ9s0t7THlt1AWnN9D5QCma60GivHOxI1Nw8ZtQohANTc+TAAobk3ytTVsdBDD11t3JXK9LomhtJRjjTiWScES3rIfJckUpYt0Vp6m2htn6fbNR7uj4+XrHNTkGm0Vs2KdfhpdwIRew9qonxpMZgW9N2PM1uMsboYoJLDpQmPjf62o7hwOoNcDfxQSFxqvkIBsd3jtdFDh4tJZ7zM9jFeT+U4IufP/l0oTpb4iwZ8o0bMaa+/duiGsRQLZ2F/Yr7eH6uZkv/WVSLeyx0TV0SsJlXlJOHJOKoAFPvp4MK0tQd30K+Mlca8ljoehdbdPavmJuB7wydoB6KnUqEboTfLBb+4w==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.rd
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.rd
@@ -74,6 +74,10 @@
    {
      "Name": "父任务负责人",
      "Formula": "任务首页!$Y$7"
+    },
+    {
+      "Name": "任务负责人",
+      "Formula": "任务首页!$Y$8"
    }
  ]
 }
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/修改报工.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/修改报工.json
@@ -201,7 +201,7 @@
  "Values": {
    "1,1": "工时执行者",
    "1,10": "执行时间",
-    "5,1": "工时数",
+    "5,1": "上报工时(实际)",
    "9,1": "任务时薪",
    "13,1": "工作进展",
    "20,1": "取消",
@@ -356,8 +356,8 @@
    "7,1": {
      "BindingInfo": {
        "TableName": "任务工时表",
-        "ColumnName": "工时",
-        "GUID": "dab9133d-40b3-4f28-86bb-648f8b33cfe7"
+        "ColumnName": "上报工时",
+        "GUID": "8dd2028c-6efe-4967-b73f-25ce0f775be3"
      },
      "CellType": {
        "$type": "ElementUI.InputNumberCellType, ElementUI",
@@ -380,7 +380,7 @@
        "max": "99999",
        "step": 1,
        "precision": 1,
-        "placeholder": "请输入",
+        "placeholder": "请输入实际工作的时长",
        "controlsPosition": true
      },
      "DataValidationInfo": {
@@ -580,7 +580,7 @@
                    "ReloadData": true
                  }
                ],
-                "ID": "b379f73c-aa98-4896-9c59-a9eafa20e529"
+                "ID": "755d3c8b-0858-4f95-a125-7348ac6d763c"
              },
              {
                "CommandList": [
@@ -595,7 +595,7 @@
                    "BtnText": "知道了"
                  }
                ],
-                "ID": "acd67a7f-986a-42a2-b64f-87c54ca2bd6c"
+                "ID": "e8dc8ebd-1c88-4e76-a7e3-15893cefb9a0"
              }
            ]
          }
@@ -870,12 +870,12 @@
    "3,1,1,7",
    "3,10,1,7",
    "20,14,1,3",
-    "7,1,1,16",
    "15,1,2,16",
    "22,1,1,3",
    "22,4,1,3",
    "11,1,1,16",
-    "22,7,1,2"
+    "22,7,1,2",
+    "7,1,1,16"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -910,7 +910,7 @@
                ]
              }
            ],
-            "ID": "20652f52-9dfc-4203-85eb-c7a613f25629"
+            "ID": "751de86b-4d68-4be5-8fbb-a224e2887f24"
          },
          {
            "CommandList": [
@@ -927,7 +927,7 @@
                ]
              }
            ],
-            "ID": "09b69303-15dc-4b26-8162-aadd0007e1ec"
+            "ID": "582c8623-a528-4da6-a898-5be54078d670"
          }
        ]
      },
@@ -984,7 +984,7 @@
                ]
              }
            ],
-            "ID": "cfd39d09-c392-43d8-8678-95922c72a481"
+            "ID": "44f4fc5d-1100-4b14-a311-b8184401c644"
          },
          {
            "CommandList": [
@@ -1001,7 +1001,7 @@
                ]
              }
            ],
-            "ID": "07fb80b4-3f8a-4be8-ba63-46cd60b2ba11"
+            "ID": "51e6a820-ed67-428f-a856-854e776cc4c3"
          }
        ]
      }
@@ -1057,4 +1057,4 @@
      "Formula": "修改报工!$H$23"
    }
  ]
-}//0t4mrARzzeBRuB9ScjBUO4Zz61DtJ6djeGOIkuDZZFNquQFc2XemjPQQSzl1w2f5BjlHAKIHVj8PT+lTlussSaR5d1iIEIxRp2PjOd5nJuLS4vcUmPBMcTJEhRqUPQRUHiL1tPDW1uJ1IwKgk/F7uVsNrPdJKRM74rwywa5z/By+Zom6rSBqZru0Vc9QajE0lbx4kZZYd684eAKHn2wo5rO2cLZC65btvbAXqxMcSZdqQ6kf2bdRgLunrMCmNJQN2TYFhQQq8hb+b9aEikWwYj9TI2GIiNzIpHyHJf1ulPfV6UiNtDB1NMb3jRrV6N0Iu/pQUwK25/ArAicokXMN8j6NVrYGvyBnf5bfNtrrk2SJ+aFnYiR1CTNP58CEMkrPvopU/4stmt85sQVVz2C9GDwUVP+DyXmiAIMFlwpaayLETyrcGDRT+0w0NPPssPv3AFF8/AR6ubSXdI6S/rdTik39ZNUIEmRwgv0+0l0rKj8EFTBKazrGwHLmD6cqaql4rBrV281Ec+5FMnE+Kz3SzXtClqm2q3uwuLPxcXbZiMN/PfrcdkQnwbZOCJkdgNYDXs+5u9plywaES4GMgZpsfS3RLP2tDDXS3c1No/YOk87eNetPA8bivyRg3ydEY6nJu3AfRAnUpDI99OLvkbMLA/DhzsQc0BkWNV3U74RD4dFr0vaFbZRANLoXBEk9vuMDOQHGH7IEAUJX8VK+9XIC35Nvd9d77xJkpuiHL5z+aNwH11FvUgk+4GQ+gAmqAsCr6/Q2nTqqVBHbtDZNke9wi3JrEFKdmrqv78+4b2rSe2e/N11mi/9rUD/T4TroVwC4EDDKuDRRTjqE9Bl+EVil3RaK044DXpd5EmLv95m49JC8TsPOoISVZTPh9KH73lyr+uieBTJNqO2aZeCldG7usg==|920
+}//hQklGfcozUMoTJUbTHeITfMom6C/Msb9eyrB8nibuIxTnBbcRcXa4BB66e0vkPgoMqAGzODBpAvkJLiFFvCgi3CZ/vHlyZ9Ms21097KabUj2TgnNkBpa0HZaPhr6uSBa0PlXD3nf8RaExkwhez11xb8WZCIAgprqtUxlkGf7Vk2OZUXSawLhyis+g57h5SjaetfGbaUlL1DCoOAPDWfRguqIR2TPjt/w2chdcUoUP+UH8UL+gKIA0s0UARx01XE/pbKqoTJGIyeJDsa8JmFG6gW5nHgEnXIFsPgcsU/tEL7fNWchUNrt6gU67B8LTrv4g288S+z/3VtgklMKKvlKWCLSs4/2c9vnX2WsjTw7NW4UgGtCZ94d8DxnEXhMQjnu3aM/D1pCO5CmpFIED4MWNzcs/Ql5oQgPg/JI0yIEmFRXrZwHAKNuUxRIDZ6NgeAsR4k6hw8aYD0ddhn1k2M4V8/V2p8Yjgw1Y2Ryil4XVdJxEvL5WhxNw8PiZqkzmyIATAlkYxfvRkvcEehJwP1+soAuZ+5uc1bFEgsSzrWtbuKvNbmB/xGRLPlIjPuJC9n6b0K59jfkluWFM7CSwlJrhIjZVN095cr5MS55uHv+kG8U83NMTB30bWPLah566KSrDPj17adZIa+I9C0xgn3XCZsp7txTPn3DUaSg4ua7wmSA9ogEqS637UxazsCGjDYzZEtPlGt6aPBlTbBgnL95a6ebgF+rav4PT6phFdSt8FXn0YTDpcaQp5iy9yd1RyYbIZDvNs73ZxM7SMaQ35sM4AV0zb/vH+PPn8gNZIEUKwr5ttuTCbtg6QnY0NK6XvT8LGQgZVyXUKEizSSkq1THbF9eiVntd11kX41h5WS8hz6B3etK+oSNn2IJOwB9QNaqbamzc0l8KI1b6PErejkZSg==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json
@@ -570,7 +570,7 @@
                    ]
                  }
                ],
-                "ID": "18eaf3a2-4a0c-4dc7-b7a3-686797c3a10c"
+                "ID": "c5e9fe2d-9736-47b9-8524-d7d0209c2792"
              }
            ]
          }
@@ -707,7 +707,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "3cac5161-d1dd-468e-8ad9-561f39760b2f"
+                "ID": "26f4be4d-c182-4413-a6b5-250d66126be8"
              },
              {
                "CommandList": [
@@ -819,7 +819,7 @@
                            }
                          }
                        ],
-                        "ID": "154f3d77-7c6c-4968-979d-4effd67ff552"
+                        "ID": "293ff116-8247-4331-95e5-cd0b7fe2089a"
                      }
                    ]
                  },
@@ -833,7 +833,7 @@
                    "Title": "加载中"
                  }
                ],
-                "ID": "2daf89b0-8886-42a1-8c2e-6070d4500249"
+                "ID": "dc884f4e-1cc8-4feb-89c3-6c305e38489a"
              }
            ]
          }
@@ -981,6 +981,12 @@
                "ResultTo": {
                  "SerializeProperty": "核定工时说明"
                }
+              },
+              {
+                "ResultPropertyName": "报工人姓名",
+                "ResultTo": {
+                  "SerializeProperty": "报工人姓名"
+                }
              }
            ],
            "RefreshAfterFinish": true,
@@ -1147,7 +1153,7 @@
                                          "ReloadData": true
                                        }
                                      ],
-                                      "ID": "5e789458-e54f-470f-a0d8-a07c7047dcfc"
+                                      "ID": "873ad2b7-0915-441d-9cb3-6e3342dd7c51"
                                    },
                                    {
                                      "CommandList": [
@@ -1162,12 +1168,12 @@
                                          "BtnText": "知道了"
                                        }
                                      ],
-                                      "ID": "7d5cc5d7-f0a6-408a-913e-c3b9103ee050"
+                                      "ID": "80eaddde-fb31-431a-839b-318977ff4b05"
                                    }
                                  ]
                                }
                              ],
-                              "ID": "d929f206-2f36-4f4e-b0ac-a9ec83170d1b"
+                              "ID": "541cae1b-8cbb-4f20-a668-4888d0cc74d2"
                            }
                          ]
                        }
@@ -1240,11 +1246,20 @@
                        "TargetCell": {
                          "SerializeProperty": "=核定确认!核定工时说明"
                        }
+                      },
+                      {
+                        "Source": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=新增报工!报工人姓名"
+                        },
+                        "TargetCell": {
+                          "SerializeProperty": "=核定确认!标题"
+                        }
                      }
                    ]
                  }
                ],
-                "ID": "05e354f7-0845-4953-9054-628bf74acb27"
+                "ID": "4b6ff782-862e-4180-a2fe-10dab1940663"
              },
              {
                "CommandList": [
@@ -1259,7 +1274,7 @@
                    "BtnText": "知道了"
                  }
                ],
-                "ID": "ea143803-22c4-4163-8625-83489e60f45c"
+                "ID": "de34dd56-94ba-4085-8bd1-e4ac0f34b1e3"
              }
            ]
          }
@@ -1671,7 +1686,7 @@
                ]
              }
            ],
-            "ID": "bd3f9718-d5f8-40f7-a1cd-5a1a05b118ec"
+            "ID": "cdb2fc93-5774-44db-94c8-5d9454cef779"
          },
          {
            "CommandList": [
@@ -1688,7 +1703,7 @@
                ]
              }
            ],
-            "ID": "dee5f996-5bd2-47e0-bc0d-767155e78d34"
+            "ID": "2817db3e-2952-48bc-9eee-e946a007821c"
          }
        ]
      }
@@ -1757,4 +1772,4 @@
      "Formula": "新增报工!$B$30"
    }
  ]
-}//Gxktr3vsRqfFv5d6sMJY0j+ZvwlG2lNMfs1Kz0YzDY0L0EK58+tyJ173C2bwzaSvAXqEmVy8+GiK1PjxWS4RrbstAcPk5mS/jmqzQ04Nq6oBVbmTWdJRJoZgtXSbfNNWOsh28XjODgNT9/NsPi7NzV40lblKwXqmYAWmlndb/9usPhH+MD89PvPtWFzOXnJkqhJ2yomfLpElwbixH7X3bmLjnu/RROXfRaz/RRv7bmZWaig+1sKLHTS/iluqRbmc42d2KuGvkZZo+3DlfjWe0zmpoueMDdqLwy5C49mpdVpFAiQNvFg0e3iYUUVhdEJuy59N1nKIz2cM1nkIOs7NKoirewhV3xsJVpOSFUthFnbuk3qvi9WkkDGzr1GL6YASFaADSynEoQKPxTFzMkj1zSF15src0B60jGW66R+vhJsD+93zTtbKo7QLS+Xi3k+xR+/bkoN2zftC1j2MEQXwds2yWMV6aNrr6wArk4jJeyCkRFczwPnyfhyCMG57WUzYPDH0IhSR5AtHTbWVlhnLVPy7S5AxZ8WCU8Mewe3nWKO5Ht8+yj7zm6Fv71UGd4yqJ4ky9uFenfCnwPf6J42HCKv3A0GJ1/agxTjKuArod15abWDY2qVS21uHz6fdTWQIihnu9CBThmKRVtYXLCk2M7PYI2cENtpDsGmlI4IcHiML9F+DuHniI0M6dT3CQNDK8muF5y8vXFOCSdD++kRE5lTKcWGu9fzNxjyermc4G4l6/YxP7sDrYKtNVcEjgg+po752bPAWAzhBNuIj4vWETsLdyjKZ+DKQ1mRVBG1pBosSrOZbDoVhOJqLY5sE3tZrwPP9vvUdpK3V/PCu3AkiCAFGvfZHkkjdztVaqt4PHelwJfiHGPkCIu3TRkDPjwZoLJ0T1OMabBht7PRysfaOcA==|920
+}//+WYmAvwNUb2mGIUl5jnwCPO/zISlCxqFeXCGz/Lnfkouy9KsK0IowbOSvegGXloIt0+nvKstWsxHssvZLshdRdv32zYVpYpu8KH08QkDrpDFJN6hLLj4sYsDpui4FbJynR4XkEcjvPObqeX/eGCImoIgOaTcIAwnfAk4+uWa/MIwtgwEavetAeZDl61YaVE6EFA+KRIAF+IB+ayxU5razCTzMrk7mKWQn+gjJnr41w4c9YH9RmISsQRP3VBZTLyP6B34og3IT/r3r1bH0kEfmbjFKnwH9ZZHNcPQuU27+jrf/ZjbzC/+LtOOWKBXSL/fUjXgTCAkCKn3d1AsZsotwwdaEPa3A2o6c44ZWurM2PS/d4q0XT6Vqp/zURYyvQJmAasWC/zx7dwfJRR4qdXPYDfQ+cW4vfZ3Jsx+///ryrs2l2X/874FmEIj8Dpxbc5C2zpExyoJAlxNEzlhKr+kNVXqxZA1z9V5biSZrxCj7Zb1qXDkjEEiKPBYCqGS4KTJq9/xK7X5ppt5lgpwDG7RTbsN9cjWOrxmU+pGB4SH3uO+0eSUmRqwQKj3E/fElXomdxyVY6qEuvkbib215bJBl0ZmR8NF3YmV7+95Po9o+UDv7Q8nDHhkZzuXKqEuo+uMUEIbralpe+hAbNJ+ykY9RcKyr14kcoRRPrsxKN0quCpOCxDaLF2oVDaMEogHTIT+atamYjdnG1F6mtoiWUg0Ul/ZReoiyeVpDuQYle5rtDsO1h/NNco7il5CwXgGNmPAUFcRk4cKOTfSDQxC1nl1vJWOHIHvJd0MFG3r/nrqnFfD8MaetgzD9kydzkmD7jENxo7dKur1xFICo/h+xU3yO9+ddeRaMJsC2TMkNbAw3r1R1a3YJSsLOhb+OrXWndR/MCDMHtifmJt9UTUTpTSxcg==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/核定确认.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/核定确认.json
@@ -311,115 +311,117 @@
        "FontSize": 24.0,
        "FontWeight": 0,
        "Foreground": 1,
-        "HorizontalAlignment": 2
+        "Formatter": 2,
+        "HorizontalAlignment": 3
      },
      {
-        "FontFamily": 3,
+        "FontFamily": 4,
        "FontSize": 13.333333333333332,
-        "Foreground": 4
+        "Foreground": 5
      },
      {
-        "FontFamily": 3
+        "FontFamily": 4
      },
      {
-        "FontFamily": 3,
+        "FontFamily": 4,
        "FontSize": 13.333333333333332,
-        "Foreground": 4,
-        "Formatter": 5
+        "Foreground": 5,
+        "Formatter": 6
      },
      {
-        "FontFamily": 3,
-        "Foreground": 6
+        "FontFamily": 4,
+        "Foreground": 7
      },
      {
-        "FontFamily": 3,
+        "FontFamily": 4,
        "FontSize": 21.333333333333332,
-        "Formatter": 7,
-        "HorizontalAlignment": 8
+        "Formatter": 8,
+        "HorizontalAlignment": 9
      },
      {
-        "FontFamily": 3,
-        "FontSize": 21.333333333333332,
-        "Formatter": 9,
-        "HorizontalAlignment": 8
-      },
-      {
-        "FontFamily": 3,
+        "FontFamily": 4,
        "FontSize": 21.333333333333332,
        "Formatter": 10,
-        "HorizontalAlignment": 8
+        "HorizontalAlignment": 9
      },
      {
-        "FontFamily": 3,
+        "FontFamily": 4,
+        "FontSize": 21.333333333333332,
+        "Formatter": 11,
+        "HorizontalAlignment": 9
+      },
+      {
+        "FontFamily": 4,
        "FontSize": 21.333333333333332,
        "FontWeight": 0,
-        "Formatter": 7,
-        "HorizontalAlignment": 8
+        "Formatter": 8,
+        "HorizontalAlignment": 9
      },
      {
-        "FontFamily": 3,
-        "FontSize": 21.333333333333332,
-        "FontWeight": 0,
-        "Formatter": 9,
-        "HorizontalAlignment": 8
-      },
-      {
-        "FontFamily": 3,
+        "FontFamily": 4,
        "FontSize": 21.333333333333332,
        "FontWeight": 0,
        "Formatter": 10,
-        "HorizontalAlignment": 8
+        "HorizontalAlignment": 9
      },
      {
-        "FontFamily": 3,
+        "FontFamily": 4,
+        "FontSize": 21.333333333333332,
+        "FontWeight": 0,
+        "Formatter": 11,
+        "HorizontalAlignment": 9
+      },
+      {
+        "FontFamily": 4,
        "FontSize": 48.0,
        "FontWeight": 0,
-        "Foreground": 11,
-        "Formatter": 12,
-        "HorizontalAlignment": 2
+        "Foreground": 12,
+        "Formatter": 13,
+        "HorizontalAlignment": 3
      },
      {
-        "FontFamily": 3,
+        "FontFamily": 4,
        "FontSize": 13.333333333333332,
-        "Foreground": 4,
-        "HorizontalAlignment": 2
+        "Foreground": 5,
+        "HorizontalAlignment": 3
      },
      {
-        "FontFamily": 3,
+        "FontFamily": 4,
        "FontSize": 13.333333333333332,
-        "Foreground": 4,
-        "HorizontalAlignment": 13
+        "Foreground": 5,
+        "HorizontalAlignment": 14
      },
      {
        "BorderTop": 0
      },
      {
-        "FontFamily": 3,
+        "FontFamily": 4,
        "BorderTop": 0
      },
      {
-        "FontFamily": 3,
+        "FontFamily": 4,
        "FontSize": 13.333333333333332,
-        "Foreground": 4,
-        "HorizontalAlignment": 13,
+        "Foreground": 5,
+        "HorizontalAlignment": 14,
        "BorderTop": 0
      },
      {
-        "FontFamily": 3,
+        "FontFamily": 4,
        "FontSize": 13.333333333333332,
-        "Foreground": 6,
-        "Formatter": 5
+        "Foreground": 7,
+        "Formatter": 6
      },
      {
-        "FontFamily": 3,
+        "FontFamily": 4,
        "FontSize": 16.0,
-        "Formatter": 5
+        "Formatter": 6
      }
    ],
    "Types": {
      "Strs": [
        "Bold",
        "#FFF18F8A",
+        "\"✨  \"@\"，请核对您的收益  ✨\"",
        "Center",
        "Body",
        "Text 1 50",
@@ -436,7 +438,7 @@
      ],
      "Borders": [
        {
-          "Color": 14
+          "Color": 15
        }
      ]
    },
@@ -577,7 +579,7 @@
      "14,8": 18
    },
    "SheetStyle": {
-      "FontFamily": 3
+      "FontFamily": 4
    }
  },
  "Spans": [
@@ -594,7 +596,8 @@
    "5,7,1,4",
    "5,12,1,4",
    "5,17,1,4",
-    "1,1,1,21"
+    "1,1,1,21",
+    "16,10,1,4"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -665,6 +668,10 @@
    {
      "Name": "核定工时说明",
      "Formula": "核定确认!$G$17"
+    },
+    {
+      "Name": "标题",
+      "Formula": "核定确认!$B$2"
    }
  ]
-}//i7wnpAiWW78Y8I4egq6MxUFap1efVxHZgYjxaNclD3HexEp4L/2dVd0WDHTYb/nD48y1YIgXU6j+EHTOI8XpTKkyM9+ScMnNz6S7xO9XTfAPiau4n26oPtoYnNcDrs2HW4MTIHfMqeyTMNOi5en4EHCFJUUb1rm+cmRbl/h1kU0j9ZHIM+a7GR6JKq0NNOLPp63ZMn7ZcZP/XxQAgFvBSZihYJa0F7JfaE+Gp5LslJ7Sg6sIh4KtegzJX9vhw9PLEVkX4nBjjn3aJJjWHzsSFgsgnxBPWqtqolvSZqhCF7Cgnwjk9xEMcOmxSNeBLl1kuI2k+BIerAjoYGXSTENGJGdwqHJOkau3MWP7Yb22/z0d6Hv/4DQfB5bga66QbztshlAhNRskYVmA1sIKrxTMc2fGltO4mswY8oaMTj7GvMA8AXUQFXDnXO/8F+1SQ+eA5eCs4sj0B7b8Vk/yhdcTP7ULXLPjs2xNQ9AWMJlCjOebJU1UfLl0jjhmi23Oe0zoO5IGnBipITxWTa8Y7UxttfizDL2upOokFL3o5WayoN7Axbhflv/icrP9U5wx8wVjnM3XnsYyNDzF2N1ZqymtOVkRc5HuJnF/AFG2+XFwmw5zcCjlS1bacJ6o7GuDnUbD1mDApQpkM+5ZXR2qK6lzFaWisYc38Sv2AworbLeN1yj8HcFUy4o0/B0GtjxQKo+1ScWYwdxUGFu41JQOHBzr9Ugcp0b8a7HluoDUFA3vwSE3ffQfRD6+VHyqsbNqZFtkmqPJnFLwlb0/vp4gW1llmnMyIy/O5oOCYkr5vnK4fkvPk3LkTDyW0O9aFBGaKx4/DuhJfUj0rgrOX3bbZKmd41jDJSTqdixMMrW9hZh9EluRfRmPm8gfTbykkrEUwEiPZUyCgFpJ/4Yc56ihbszbDw==|920
+}//JgiHkeAGDDomXZnxKh1s08cQGYgFCZYemPsdcbwPJupebXphH9HWgTJ5KL7752TdnATlXXvym1F9HCHer0TlbLfBQq/0Cu18lkGTmtDHLozltz35TJAWkgsAWeY1ftV+j1cLkTcPChPTUpYHbUrkRJiYFmeynSeVjwQJ+nBlRvpv7KNs4bJQUmw8tCopyl+F4Kz7xawb9fWZSl4Od0vdck6CmkhY0dWp1fqccv1YosoFPUUuavmwZ87Ioqp8+Fqa/LqHsULpwEuETCn/DoNN2GPskwZQcHymXR+wKsh2ThEes4ed8CB4vb41QxP2+y7DYwsWjDF/+hFkpEx5b7p0hDGDSUv9GJtEopn+ZLkrXNRL29DmkeNzzw9R2QtCqWHolAtU6JBb7AQytkR0R6yBl8Qs8c9m/fMLMLxkx2bS5qxlwa7ulc/5U49vR8ucpUbbfrI6f5uF2vgg74Vj8tZV1EjrdzRzPSQ+SVtZMsBYfv+5x0kMeTq16dZ17YFdfRudM6aB/77mnlnFrIIEUiN5L6YxuAJ7TLHsxzaFxOog4xbxGJ93eayUtYLDmf3U5u/44SRgpPUF/zxPQGb6o6k3602zC/rMTOE/vgL1RErorJPxOTxTyJdJk3+zyz03katN2kQ6b2s+uRp+/hfpM6uuOZDEQA9WGYL7qqf1ojnWKA1WjuoZzIAlFsrC79/13qPcenDH2DFojO/KEXABRrxqHuI5CzL+J2wwZhjxWerHEwPKvV2Gp7LhqE+pKC6Zf4ZDEuxaBmLjDjIL1FUOqRPjNdqQbd0kwuPh8VvgB/7eH4jNDh+xHPMadZkQfmP7drTajoLbda+ICkTITcRXnqAqiVU+z+vNTs1ofNH5UgkQvB761tgRLvyJmIdd1T1zE9NbiWO9y32+Hd8p/riCObOI/A==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/核定确认.rd
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/核定确认.rd
@@ -30,6 +30,10 @@
    {
      "Name": "核定工时说明",
      "Formula": "核定确认!$G$17"
+    },
+    {
+      "Name": "标题",
+      "Formula": "核定确认!$B$2"
    }
  ]
 }
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情-列头.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情-列头.json
@@ -73,8 +73,8 @@
  "Values": {
    "0,3": "执行人",
    "0,4": "计划工时",
-    "0,5": "实际工时",
-    "0,6": "实际/计划"
+    "0,5": "核定工时",
+    "0,6": "核定/计划"
  },
  "StyleDatas": {
    "Styles": [
@@ -128,4 +128,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//KElO26OjDQlktzx0cuSu7vDSWsRbk7xww9g+wE6GBK6RKAPeVISgnBAX1RlStO4TNo/kYqJcVC1sX3LaXCCyl8q5pyOAkWyWvYXy7loOq6gHSrzY6W5nBTIwYkvmt/ARGfdWwkP+b8Hp4rjUkrXyQ86Nu6sJ5UJPlVila9fV1c0wvZIzwLnYXF4q8E/JIi7WXSHvzjOxYTGRS9+PVdcBitJdQ8OEawcki50qqIOwtDftREtkE498ycQKUiVnv669jwGJKFV3LEhl8QibllMbgcTcVkDXCa72iBYCtT7IkiNWpglif5CgbSSudzth/WCfkShA+T8saQZ005wwYyC61Z+EYrKybwQlOO/Ex63cALxIuMMsr0V8IlyHxq3hAp6qYJe6BqsYLvImFk/JaSqnfhRlfgy2gmczyPoVDEjsdNrz3egp6SGdaP4ATZK+7pymNw66V40Xd8+E6fFYNKiStlX+qKIHepCRutlj8Bf9CfpEm8gp/6dxn6ROIFmj6QhwKxRUbK+LpNLopFQ7onCcIYVsznQ6MRelq09kuJj0i4gy5nypTSTLzL29M0VJBNXD/sCS2jg2arIDBKX8KHiFBLbpLLQZOlwzdwX9NCc4bahyXXUXi09KtniwekHtsR4lbcJ7KhIxTZJHK8s7zFNA3ZZwGRUsu247VIx0igO7yZggn9FPZ1kCskcEEji+Pd6X/ZvcjeHB/MNkss/bJK+6GBmAqwNTJ2gGhGzSHKHCIvNNnr2Z/T2HlX1V81O+Q2QSph3HqdmPsJxFY2SEUFDJ/FsnW2wB8EGV402v2ju1qS2o14OyeSBHzQoEf9JmQZu16zx59Vd8WaqDJPr//fq7ohLPCNsnMSmE+Peq260hQ20ns5fLT3lhAbsHJsWu7KgV3/AJdOhl33YjSlw3fIoFFw==|920
+}//kuVIRoz83LNQI8AGY4otacSLJGRilDZhFGGjJHjgK2jM7/Y6DFe4qA5QCrtUGCHK3jBN+JB5O0UxrSV3M0UWxkrTlhaekRwhBWvTwBanfuGvLKP0AOKCgZDFJxZhUAh6iMPNCjvvwYmTO0s/BUGAPfCRWOuGSsFSKDAkYd0TiwCfP9aKOPlNIsl4beDpPM6vw5bqIePjg4CCc+Xhsy8K6VMfzWXcT68NY6cFToQ80+IBiDM3IX3LO0H36SEVjX4mXsaOoyyyY123vAAA86jgPhGLt4khpo9Kw0AIcZWtVyPY8cKjKAvtcOFkRe9L/tkAA7KSPQIggQ2LywxdwvM0QS1NRVayvQEmGcyNiWp/7lLvl3x+J8qnkjgJsgnxtNMMTC88IPRerli7GKECZ6KcnJ1suH7p45q++e2ll/3Kx7tqxVeN352RJlgLYZI4xMhLDHkrnwOoEnoAJCrG1+eWB+qDNOlWLEF7f31kc1ubmPPXNF+BzHL9lIj012fEnUiuM+ieJ1O9iKEWMyiCuqByp42TnHS1BqohcSnRFHtzUOHJS51mw2DhkpBGUkKdT43QhFV7phRuLEDMLgh1jRxTtkQe99qpASfS6tFY2NH+qXVaRyWoNSPYb8pL5LQUfe4tK/f3CnbDXBn5x7nYqZbwnjKUC2vzq1qSICm+Ask3LNlqf0rDGQDBCfskl6NRo/HNLn31nLiU8AlD6ECT5y01vVxW9XVrQ8X/Ate5P6asjuFMhi2vx8Rc3jD16R6guXEbT6BVxStZAo4UsWjsUV6DQzG7kTziX7eh9j7IURpY+UZDCwntberadWZh46dukUkPvRSCVAtluv68XUvbwhi6XFu4Nf7q6OjYf+0B7q0Ua1+f7uqRijN/Chbt1r7P/w88wTzH7Qxull7k9r+8sDH0tA==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.json
@@ -46,23 +46,13 @@
          "DesignLengthInPixel": 439.0
        }
      },
-      "9": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
      "10": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 36.0
-        }
-      },
-      "12": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 32.0,
          "IsHidden": true
        }
      },
-      "13": {
+      "11": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 32.0,
          "IsHidden": true
@@ -70,10 +60,10 @@
      }
    },
    "InLogicalVisibleIndexes": [
-      12,
-      13
+      10,
+      11
    ],
-    "Count": 14,
+    "Count": 12,
    "DefaultSize": 32.0
  },
  "Cols": {
@@ -224,9 +214,7 @@
    "3,12": "可报工",
    "3,18": "完成比例",
    "6,1": "工时明细",
-    "7,1": "工时详情-列头",
-    "10,9": "分配工时",
-    "10,14": "工时上报"
+    "7,1": "工时详情-列头"
  },
  "Formulas": {
    "3,20": "O4/D4*100",
@@ -295,7 +283,7 @@
                "ColumnName": "总计划工时",
                "GUID": "5c7962d3-0bf1-4eff-a603-59b43df0b807"
              },
-              "ColumnName": "总计划工时"
+              "ColumnName": "计划工时"
            },
            {
              "GUID": "c2efb933-40aa-4dad-8fc3-1c7dfdf07441",
@@ -304,13 +292,13 @@
                "ColumnName": "总核定工时",
                "GUID": "f3031096-d234-4bca-9130-c455e8ca7f03"
              },
-              "ColumnName": "总实际工时"
+              "ColumnName": "核定工时"
            },
            {
              "GUID": "08d57828-8d12-4fcf-a2b0-c159bcfe83ec",
              "Formula": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=ROUND(工时详情!总实际工时/工时详情!总计划工时,2)*100"
+                "SerializeProperty": "=ROUND(工时详情!核定工时/工时详情!计划工时,2)*100"
              },
              "ColumnName": "完成比例"
            }
@@ -334,142 +322,14 @@
        "TemplateKey": "竖排无样式"
      }
    },
-    "10,9": {
-      "CellType": {
-        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
-        "CommandList": [
-          {
-            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-            "ConditionAndCommandPairList": [
-              {
-                "Condition": {
-                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                  "param": {
-                    "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
-                    "tableData": {
-                      "TableName": "任务平行视图",
-                      "ColumnName": "任务成员",
-                      "GUID": "ef34254a-1377-437c-ae84-35e532d97189"
-                    }
-                  },
-                  "value": "%CurrentUser%",
-                  "compareType": 10
-                },
-                "CommandList": [
-                  {
-                    "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-                    "PageName": "分配计划工时",
-                    "PassValues": [
-                      {
-                        "Source": "计划",
-                        "TargetCell": {
-                          "SerializeProperty": "=分配计划工时!工时类型"
-                        }
-                      }
-                    ],
-                    "LoadBindingDataOption": 1
-                  }
-                ],
-                "ID": "cbe09e93-b1d0-4cce-b7be-bd0b557f1f44"
-              },
-              {
-                "CommandList": [
-                  {
-                    "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
-                    "FourStandardStyle": "warning",
-                    "Message": "你尚未成为该任务参与人，不能报工"
-                  }
-                ],
-                "ID": "3f46914e-29fe-4093-8824-025db5eea0bc"
-              }
-            ]
-          }
-        ],
-        "Text": "分配工时",
-        "IsDisabled": true,
-        "TemplateKey": "圆角浮动",
-        "Icon": {
-          "Name": "Application/005_add_5.svg",
-          "BuiltIn": true,
-          "Color": "Background 1",
-          "UseCellTypeForeColor": true
-        },
-        "IconSize": 14.0
-      },
-      "RulesGuidList": [
-        "a8e409dd-908f-46da-9e04-493e23e6f6ff"
-      ]
-    },
-    "10,14": {
-      "CellType": {
-        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
-        "CommandList": [
-          {
-            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-            "ConditionAndCommandPairList": [
-              {
-                "Condition": {
-                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                  "param": {
-                    "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
-                    "tableData": {
-                      "TableName": "任务平行视图",
-                      "ColumnName": "任务成员",
-                      "GUID": "ef34254a-1377-437c-ae84-35e532d97189"
-                    }
-                  },
-                  "value": "%CurrentUser%",
-                  "compareType": 10
-                },
-                "CommandList": [
-                  {
-                    "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-                    "PageName": "新增报工",
-                    "PassValues": [
-                      {
-                        "Source": "实际",
-                        "TargetCell": {
-                          "SerializeProperty": "=新增报工!工时类型"
-                        }
-                      }
-                    ],
-                    "LoadBindingDataOption": 1
-                  }
-                ],
-                "ID": "42615e40-02b3-4489-bda6-f5a90b75318b"
-              },
-              {
-                "CommandList": [
-                  {
-                    "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
-                    "FourStandardStyle": "warning",
-                    "Message": "你尚未成为该任务参与人，不能报工"
-                  }
-                ],
-                "ID": "9dc52194-b130-4a31-a891-dfd2a1a36c73"
-              }
-            ]
-          }
-        ],
-        "Text": "工时上报",
-        "TemplateKey": "圆角浮动",
-        "Icon": {
-          "Name": "Application/005_add_5.svg",
-          "BuiltIn": true,
-          "Color": "Background 1",
-          "UseCellTypeForeColor": true
-        },
-        "IconSize": 14.0
-      }
-    },
-    "12,1": {
+    "10,1": {
      "BindingInfo": {
        "TableName": "任务表",
        "ColumnName": "ID",
        "GUID": "a480c8d8-43fc-4d8f-a19e-554d2c55d49a"
      }
    },
-    "12,7": {
+    "10,7": {
      "BindingInfo": {
        "TableName": "任务表",
        "ColumnName": "项目ID",
@@ -481,7 +341,7 @@
        }
      }
    },
-    "12,10": {
+    "10,10": {
      "BindingInfo": {
        "TableName": "任务表",
        "ColumnName": "项目ID",
@@ -686,18 +546,9 @@
      "8,0": 3,
      "8,1": 8,
      "8,26": 3,
-      "10,9": 3,
-      "10,10": 3,
-      "10,11": 3,
-      "10,12": 3,
-      "10,13": 3,
-      "10,14": 6,
-      "10,15": 3,
-      "10,16": 3,
-      "10,17": 3,
-      "12,4": 9,
-      "12,5": 10,
-      "12,6": 11
+      "10,4": 9,
+      "10,5": 10,
+      "10,6": 11
    },
    "SheetStyle": {
      "FontFamily": 4
@@ -706,17 +557,15 @@
  "Spans": [
    "3,1,1,2",
    "8,1,1,25",
-    "12,1,1,3",
-    "12,4,1,3",
+    "10,1,1,3",
+    "10,4,1,3",
    "7,1,1,25",
-    "10,9,1,4",
-    "10,14,1,4",
    "3,12,1,2",
    "3,7,1,2",
    "3,18,1,2",
    "3,20,1,6",
-    "12,7,1,3",
-    "12,10,1,4",
+    "10,7,1,3",
+    "10,10,1,4",
    "3,14,1,2",
    "3,3,1,2",
    "3,9,1,2"
@@ -749,23 +598,7 @@
    "RepeatRangeSettings": [],
    "RelatedDataTableName": "任务平行视图",
    "ConditionFormatRulesCollection": {
-      "Rules": [
-        {
-          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
-          "Formula": {
-            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-            "SerializeProperty": "=OR(工时详情!$H$13=1,工时详情!$H$13=2)"
-          },
-          "GUID": "a8e409dd-908f-46da-9e04-493e23e6f6ff",
-          "StyleInfo": {
-            "Underline": null,
-            "Strikethrough": null
-          },
-          "IsDisabled": false,
-          "IsInvisible": false,
-          "IsReadOnly": false
-        }
-      ]
+      "Rules": []
    }
  },
  "PrintInfo": {
@@ -775,15 +608,15 @@
  "CustomNames": [
    {
      "Name": "工时分配方式",
-      "Formula": "工时详情!$K$13"
+      "Formula": "工时详情!$K$11"
    },
    {
      "Name": "任务ID",
-      "Formula": "工时详情!$B$13"
+      "Formula": "工时详情!$B$11"
    },
    {
      "Name": "执行人",
-      "Formula": "工时详情!$E$13"
+      "Formula": "工时详情!$E$11"
    }
  ]
-}//9CrSz2ffdRp38ujSZJg28pO0RFgN3ImA/71Fa4Omlj85gW1vI6kn+h5YqRWhFSTWGYjm6vqcrR4fV+0jbCrqgS4gmnS/ljBq0x33yRMQFrmvL4SHuu1MSgQM030wftuP3aE7jRL5nZfScfP8yARhH/WDvUB1RGtJ/d54uxeYa1Cat+XgSc4GUvUIh7xfxPv25YYCHGsNY9Tk3NXG+X3bCHkZ3YBPETaIKOAOMP6XAIgm7zmsDrYEIl7f2ll8OXnclqEr3TCJQow+31Q3qCaS9folIy1JAhPEUAbVjULCsqTUlcJroL1jktD50gpwp5sI+rh0e135M26OgEpDO5TwnTmnmlrqAX4SWxhZykgqgqUMk+yhnLGaI8ksSXC1GGfipezw0rS8KYIdTYd6LRlUQ0F98eYT9SobrP5S6SiqktMc8LYkRQtAJLow1f/EcOxOoqdGFCzgmEln2npFeHSpiHuMqEOLmjvAiDwaYC3gMdHMq+I4iW6S1T+uaG3QTPIeJ+6JRNzflcgNAFvGqGWgwj0yCqWGpnerE77JpofxzUN0CO7l2YXsqN0kZYbk87GNYrZha4QKWWiexpCaolyimknrR1TP/whGtEcKiGhiFhScEtgyVDNm1poqbr8CH8N+Vr5H26HyNTK3dXfvemHgkCIBPZVBvpZkNUV4/roJMYbRr2zOUv1aGPuZ4GI+qu8Lzu4OJxiM4815jlHuQlfidssdPrEc9HJnd45oCdxuIH80y6iy/aLiLnILiMDX853QEKyHaFrx+ZV8upSdF5UpJ79b5zcU4O0dxxXZMtXaL8Hy8QZCmX5En6eldLlS7gEFQ3oqR74Uj3f3uRJit2H8ujvIfaTzp8Cm2hAp34kZjGYBkFM/78liKUqFWtyeXWw8VvW2hANiv3+MsP7VLKy7Fg==|920
+}//Gn+JoffY4bhNjoBJj64UEACmAQbMSnu5QR/d99uSHDai10SxL5wha/xlSHau7o8vMaKd7e9XizKWWN2NXQtwJcUpmF2WVW5VHTGKgNvulQvIc2ZEWfKCBwKmhiE+uPQAQLNx5RHcOwniLNF3ofZpRoCaDEmHUYDNGIiqeZXdJDyuoep6DcZ7wjn9noYJmhjNxKO8TfvdS8oNEfuWuTp856zyeyQ4NqECj7wXqRKpSCDSbjnUC1E1rL/y3mATXt87xyGIjbVrCvVgdlqPnT8iNfHPSI25Kh2XOW1MVl5P++kDbBiNffrp8GAEQJc+B1KbC91n7mI3va7Y0Q2G2ZTw3Iey8Ey1J7JwUFaet+iIDK/cslN8MWEktb+nD7u+4GKrPcbFA3eJFC63DzVsoGUtgNrETsT7PFSrmD1SuaWj1Lcv+b1GB+7dcf04lcPmYGv3aFZ79bTQS6AbxMJJsXNFIR4uipdRHbrqI0Ii9VMw8eNXMtlz0Ka/V+igirFFfZpTxmouLthxGcw4GGJI7NqBQZOs+d0F0VFYo9srQVxJt119KuYJu/abm+Dbq41V5mvul4i/dNLXpbLsg/i9cvOsgCdmUwk5LphITpsIp43VvS8l9pyUuojtwPa4vmGYFsedeGI+3ajcqSW6TDjY4LJyaX0CkbqJ/2KG5TtNIOaIeC+LCCW9eSlT9rF08ghdDaSsT/9/blEe+pkDc1w5SqXUv0FNd10wwRvs704lWENfhN1hoAbarZeHjuNOcWsxc+dNZlR2N7tikbeFaRvAHnqfpgq6QAvcHEzVWlR6gpxqz7/hV7l4smsbN7j2+fqy0IYKYOGVwaK8uCYgkxvB4Guf1ttuEQ0tWDm5byEujl0VbjIsieHal/zvjn+ConoXsEmzq7PRSlryEU5oqFJYPRO8/g==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.rd
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.rd
@@ -1,7 +1,7 @@
 {
  "PageType": 0,
  "ColumnCount": 27,
-  "RowCount": 14,
+  "RowCount": 12,
  "Formulas": {
    "3,20": "O4/D4*100",
    "6,4": "\"当前项目采用的工时分配方式是【\"&工时分配方式&\"】\""
@@ -9,15 +9,15 @@
  "CustomNames": [
    {
      "Name": "工时分配方式",
-      "Formula": "工时详情!$K$13"
+      "Formula": "工时详情!$K$11"
    },
    {
      "Name": "任务ID",
-      "Formula": "工时详情!$B$13"
+      "Formula": "工时详情!$B$11"
    },
    {
      "Name": "执行人",
-      "Formula": "工时详情!$E$13"
+      "Formula": "工时详情!$E$11"
    }
  ]
 }