{"Message":"完成工时上报功能","MessageType":2,"Modules":[{"State":1,"Type":11,"Name":"UserService"},{"State":1,"Type":1,"Name":"PCPage/任务-子任务列表"},{"State":1,"Type":1,"Name":"PCPage/任务-工时"},{"State":1,"Type":23,"Name":"TableView/用户信息视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/用户组织关系视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/角色信息视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/角色分类关系视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/用户角色关系视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/角色组织关系视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/角色拥有权限视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/组织信息视图","ExclusiveType":0},{"State":1,"Type":23,"Name":"TableView/组织级别视图","ExclusiveType":0},{"State":1,"Type":1,"Name":"PCPage/工时详情"},{"State":1,"Type":1,"Name":"PCPage/工时详情-列头"},{"State":1,"Type":31,"Name":"UserControlPage/工时记录列表"},{"State":1,"Type":23,"Name":"TableView/View_任务工时统计"},{"State":1,"Type":1,"Name":"PCPage/新增报工"},{"State":1,"Type":15,"Name":"ServerCommand/新增工时"},{"State":3,"Type":23,"Name":"TableView/子任务视图"},{"State":3,"Type":1,"Name":"PCPage/右键菜单1"},{"State":3,"Type":15,"Name":"ServerCommand/删除指定人员工时"}],"Version":"v1"}

2024-03-01 20:22:01 +08:00
parent 528722fec7
commit bc1df963cf
17 changed files with 1235 additions and 406 deletions
--- a/Pages/31a709cea02e45ad83bb92336a6d829.json
+++ b/Pages/31a709cea02e45ad83bb92336a6d829.json
@@ -13,19 +13,15 @@
      },
      "2": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 10.0
+          "DesignLengthInPixel": 10.0,
+          "IsHidden": true
        }
      },
      "3": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 370.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "Mode": 1,
+          "IsHidden": true
        }
      },
      "4": {
@@ -41,6 +37,8 @@
      }
    },
    "InLogicalVisibleIndexes": [
+      2,
+      3,
      5
    ],
    "Count": 6,
@@ -60,7 +58,7 @@
      },
      "3": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 293.0,
+          "DesignLengthInPixel": 208.0,
          "Mode": 2,
          "MinLength": {
            "Unit": 1
@@ -84,9 +82,19 @@
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 160.0
        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
      }
    },
-    "Count": 8
+    "Count": 10
  },
  "Values": {
    "1,3": "执行人",
@@ -129,22 +137,52 @@
      "TemplateCellSource": "执行人"
    },
    "1,4": {
-      "TemplateCellSource": "计划工时"
+      "TemplateCellSource": "总计划工时"
    },
    "1,5": {
-      "TemplateCellSource": "实际工时"
+      "TemplateCellSource": "总实际工时"
    },
    "1,6": {
      "CellType": {
        "$type": "ElementUI.ProgressCellType, ElementUI",
        "CommandList": [],
-        "strokeWidth": 8.0,
        "color": "Accent 1",
        "showText": false,
        "textInside": true
      },
      "TemplateCellSource": "完成比例"
    },
+    "1,8": {
+      "CellType": {
+        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+            "PopupDisplayMode": 1,
+            "Placement": {
+              "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!I2"
+            },
+            "PageName": "右键菜单1",
+            "PassValues": [
+              {
+                "Source": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!F6"
+                },
+                "TargetCell": {
+                  "SerializeProperty": "=右键菜单1!点击按钮"
+                }
+              }
+            ]
+          }
+        ],
+        "ToolTip": "操作",
+        "Size": 24,
+        "TemplateKey": "按钮图标",
+        "ImagePath": "更多.svg",
+        "UseCellForeColor": true
+      }
+    },
    "3,0": {
      "CellType": {
        "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon",
@@ -164,7 +202,8 @@
              "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!E6"
            }
          }
-        ]
+        ],
+        "OverflowMode": 1
      }
    },
    "5,3": {
@@ -173,6 +212,149 @@
    "5,4": {
      "TemplateCellSource": "任务ID"
    },
+    "5,5": {
+      "CellType": {
+        "$type": "Forguncy.TextCellType, ServerDesignerCommon",
+        "SavedValidators": [
+          {
+            "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
+          }
+        ],
+        "TemplateKey": "_RS_NewLittleRoundCorner",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                    "cellLocations": [
+                      {
+                        "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!F6"
+                      }
+                    ]
+                  },
+                  "value": "%Null%",
+                  "compareType": 1
+                },
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                    "ConditionAndCommandPairList": [
+                      {
+                        "Condition": {
+                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                          "param": {
+                            "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon",
+                            "contextProperty": {
+                              "Display": "值变更原因"
+                            }
+                          },
+                          "value": "passValue"
+                        },
+                        "CommandList": [
+                          {
+                            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                            "ConditionAndCommandPairList": [
+                              {
+                                "Condition": {
+                                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                  "param": {
+                                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                                    "cellLocations": [
+                                      {
+                                        "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!F6"
+                                      }
+                                    ]
+                                  },
+                                  "value": "编辑"
+                                },
+                                "CommandList": [],
+                                "ID": "caab7bc7-f9a7-4638-aa83-e6b825c28960"
+                              },
+                              {
+                                "Condition": {
+                                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                  "param": {
+                                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                                    "cellLocations": [
+                                      {
+                                        "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!F6"
+                                      }
+                                    ]
+                                  },
+                                  "value": "删除"
+                                },
+                                "CommandList": [
+                                  {
+                                    "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                                    "TableName": "任务工时表",
+                                    "UpdateType": "delete",
+                                    "ShowConfirm": true,
+                                    "ConfirmText": "您确定要删除吗？",
+                                    "RowsToUpdate": 1,
+                                    "RowsToUpdateCondition": {
+                                      "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+                                      "SubConditions": [
+                                        {
+                                          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                                          "ColumnBindingInfo": {
+                                            "TableName": "任务工时表",
+                                            "ColumnName": "任务ID",
+                                            "GUID": "a226691a-492d-4ea8-a107-20d50988ebea"
+                                          },
+                                          "Value": {
+                                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                            "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!E6"
+                                          }
+                                        },
+                                        {
+                                          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                                          "ColumnBindingInfo": {
+                                            "TableName": "任务工时表",
+                                            "ColumnName": "执行人",
+                                            "GUID": "b6bc9d16-db90-430e-ac86-6b289ed7a1c2"
+                                          },
+                                          "Value": {
+                                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                            "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!D6"
+                                          }
+                                        }
+                                      ]
+                                    }
+                                  }
+                                ],
+                                "ID": "97650be6-4583-42eb-be9b-6c6e325130b8"
+                              }
+                            ]
+                          },
+                          {
+                            "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+                            "PropertyItemsList": [
+                              {
+                                "TargetCells": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!F6"
+                                },
+                                "Value": "%Null%"
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "800e69d5-0bc4-4b60-8f83-094a5af9213a"
+                      }
+                    ]
+                  }
+                ],
+                "ID": "7950daf7-879f-4a4b-9ced-281e2bd27564"
+              }
+            ]
+          }
+        ]
+      }
+    },
    "5,6": {
      "CellType": {
        "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
@@ -223,6 +405,12 @@
        "FontSize": 12.0,
        "Formatter": 4,
        "HorizontalAlignment": 3
+      },
+      {
+        "Background": 5,
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "Formatter": 6
      }
    ],
    "Types": {
@@ -231,21 +419,31 @@
        "black",
        "General\"小时\"",
        "Center",
-        "General"
+        "General",
+        "#FFFFFF00",
+        "@"
      ]
    },
    "CellStyles": {
      "0,5": 0,
      "0,6": 0,
+      "0,7": 0,
+      "0,8": 0,
      "1,3": 1,
      "1,4": 2,
      "1,5": 3,
      "1,6": 4,
+      "1,7": 4,
+      "1,8": 0,
      "2,4": 2,
      "2,5": 3,
      "2,6": 4,
-      "5,5": 0,
-      "5,6": 0
+      "2,7": 4,
+      "2,8": 4,
+      "5,5": 5,
+      "5,6": 0,
+      "5,7": 0,
+      "5,8": 0
    },
    "SheetStyle": {
      "FontFamily": 0,
@@ -253,7 +451,7 @@
    }
  },
  "Spans": [
-    "3,0,1,8",
+    "3,0,1,10",
    "5,0,1,3"
  ],
  "PageInfo": {
@@ -264,4 +462,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//Ubq1ip4R1P3IhOMQd1zdLfWqUsoIqymsBekrgLSt6HIH9jbQajPezZvtBzU23vbFj7KMLbIR74iaCV1wx47xGEHEAHuuYJrPbIElyCJxQgowrUkWvpWj/MC8vG34t6f49cRe6NK4Usfhzz0MhBA9SV3qCVbsOPDzFzLPGU4HPlG9Rd1rLbpz7HK69r7r7DnIFfjXpCJ/XTDFB9APybLjgw2k8NFYJ9OTusskqtYuSGj2MISSWIv2gMGxzVtMRJQmmtxTJhZ5thcLu/HekV34ijFBTPjp2MUzWwolALovVSv7meD8DAal63Mm/I1tP3gyDpxYk5POWJyKHd4iiLH2CmiVGEMsOk81bnl6ko/suWmZpwQwzMpdDqG4V28XP+0u3C6fNMs87Qy+vBO/V8L3PM2CxHbTskdAjuL4Fd0JAduU4EzsvOaHWJCnkUu6erRn1vrC224XNnb7sh694ziRQQyPZMtB+kpAPEz5iwClFmrPuGoo1golZsGQXs1aYqK5SWDhItLrc6MAEcBDvZYK9amBbOPcjUoGNj92WVoABbgB72ATFWvUEDnnPHouMgBA4ls02x5OcJPiEdKx8Dn7nhHn/QWrXT3+yYHWUpoxsnp08M26abjnQXaUcufzMjCmkz6e7btfJ/byGEuKoxQpVt6TXdd+hCqSbJqwVDYJSfwdAvQajhawlBr8VeHdGshhgFyEVy1dGPdCuD7O+BEJguGIRuycy6UyMGqsBohgheZHOR1CRWfVg/6ZgB0wV5NrRNTmm0S7zKVEjeakBMQVM/QJyea/ZNEc1AHKnA9HO/MVBZ1VulHWhfcH6j9gALXWYRaQZ2HzyW+nj28XL6gTZsM04GYYV2bHB5FUx0HNbIB0x/wA5YRUjjNQErNT49pPKkXssXw8fcErPMSpC1UteA==|920
+}//fP0olUxyCml4V6TCkgs3u3fJQcwfQ6Ob4BmOIG5mF0//aG7163IKP6VHHzje4mVMhf2Aq/aHuKYOfMrfZWAacwZRyoZxeOGtG7uEBLljWnj6CdZEMU7BLjR9wMia24HwDgLKdfIjgcG/O+3Pn2agF1VMnIFmK7973VtKFlTU4zVj8OyuZHH3n9idSfRL939a3DOuOHXrzy/76M0aPyOWdK100cqbNhCXf40g3n2zyKV6VeYy1B1ZYJmiwxfHUpC7luPL66khtkSzwPV/PTeBeos9LYEhOYV6muPpYNbXwpgygNqC7wriGBZ5QDL15IGAUk5PEUYSQWlnBoLZ3p+svSjazufgcfh+cYgn5oiAt6j/W3FI+utTwSrYyawNmfi5g7DH/d2wmm9t0VWvSpmkX3tKUj5932BMqQforYsfZgfR3Mm1Ngz5biCdRkvgGwnEJhSCgKa8KyWJRBe69QuVUdMAc3Nq1TqFWOxjgdRAAZZnTymZPSBqB3znL689MaXztoFXOyZMnnEuSUEY3mrVpMHe7IsSC83Y45jKjUz9xqmWnB1G5IMvAaM4DLlXrryC450PVMggdSd5wosgSlzte2AlPjTH85qgLNajfwAwdWC2QZT7z5m9dNKw5fu/0Zg2JuJwU1ERYStGeD+tNxWSxezeaCBJyFSKO0Q6FDYE5E2HpM03j7D343fwe4qyVQqYVot9u5s+hC9VTYb/WNooDeU/EGzNs3tK+M2yJy3ajL653CDuIpJevBMUOJo75q2YCzyj2aKOHPs0jg/xudmlWlyBGj3MHqCjSHZscPOGeozafyM2Hwnlltwo4J8yDndr81pOjOJpLXWg8RetDDeCLzr3zMAHh/8CcnW/iuLkI8J5KUWSuzZqsg5CKJ/q75rJiMnHDLbReFdFvFTJSbnxTA==|920
--- a/Pages/36d33d0079644f28b16bd0fec90394c.json
+++ b/Pages/36d33d0079644f28b16bd0fec90394c.json
@@ -21,9 +21,17 @@
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 10.0
        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 21.0
+        }
      }
    },
-    "Count": 4,
+    "InLogicalVisibleIndexes": [
+      4
+    ],
+    "Count": 5,
    "DefaultSize": 10.0
  },
  "Cols": {
@@ -70,6 +78,27 @@
    "1,2": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+            "PopupDisplayMode": 1,
+            "Placement": {
+              "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!C2"
+            },
+            "PageName": "右键菜单1",
+            "PassValues": [
+              {
+                "Source": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5"
+                },
+                "TargetCell": {
+                  "SerializeProperty": "=右键菜单1!点击按钮"
+                }
+              }
+            ]
+          }
+        ],
        "ToolTip": "操作",
        "Size": 24,
        "TemplateKey": "按钮图标",
@@ -79,6 +108,125 @@
    },
    "2,1": {
      "TemplateCellSource": "执行内容"
+    },
+    "4,1": {
+      "CellComment": {
+        "Comments": "弹出菜单点击后传值"
+      },
+      "CellType": {
+        "$type": "Forguncy.TextCellType, ServerDesignerCommon",
+        "SavedValidators": [
+          {
+            "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
+          }
+        ],
+        "TemplateKey": "_RS_NewLittleRoundCorner",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                    "cellLocations": [
+                      {
+                        "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5"
+                      }
+                    ]
+                  },
+                  "value": "%Null%",
+                  "compareType": 1
+                },
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                    "ConditionAndCommandPairList": [
+                      {
+                        "Condition": {
+                          "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                          "param": {
+                            "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon",
+                            "contextProperty": {
+                              "Display": "值变更原因"
+                            }
+                          },
+                          "value": "passValue"
+                        },
+                        "CommandList": [
+                          {
+                            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                            "ConditionAndCommandPairList": [
+                              {
+                                "Condition": {
+                                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                  "param": {
+                                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                                    "cellLocations": [
+                                      {
+                                        "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5"
+                                      }
+                                    ]
+                                  },
+                                  "value": "编辑"
+                                },
+                                "CommandList": [],
+                                "ID": "4fe7c5da-1539-49d1-838b-92aa8f6d3d80"
+                              },
+                              {
+                                "Condition": {
+                                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                  "param": {
+                                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                                    "cellLocations": [
+                                      {
+                                        "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5"
+                                      }
+                                    ]
+                                  },
+                                  "value": "删除"
+                                },
+                                "CommandList": [
+                                  {
+                                    "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                                    "TableName": "任务工时表",
+                                    "UpdateType": "delete",
+                                    "ShowConfirm": true,
+                                    "ConfirmText": "您确定要删除吗？"
+                                  }
+                                ],
+                                "ID": "286596cc-cbd7-4894-bb5e-3a13ed1bd524"
+                              }
+                            ]
+                          },
+                          {
+                            "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+                            "PropertyItemsList": [
+                              {
+                                "TargetCells": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5"
+                                },
+                                "Value": "%Null%"
+                              }
+                            ]
+                          }
+                        ],
+                        "ID": "5f07e2fd-83de-4368-aafc-6f995b470860"
+                      }
+                    ]
+                  }
+                ],
+                "ID": "a0263d1e-3377-4bc7-b465-f487a10cd62a"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "4,2": {
+      "TemplateCellSource": "ID"
    }
  },
  "StyleDatas": {
@@ -96,6 +244,10 @@
        "HorizontalAlignment": 2,
        "VerticalAlignment": 3,
        "WordWrap": true
+      },
+      {
+        "Background": 4,
+        "Formatter": 5
      }
    ],
    "Types": {
@@ -104,6 +256,8 @@
        "Background 1 -50",
        "Left",
        "Top",
+        "#FFFFFF00",
+        "@",
        "Body"
      ]
    },
@@ -111,10 +265,11 @@
      "1,1": 0,
      "1,2": 1,
      "2,1": 2,
-      "2,2": 2
+      "2,2": 2,
+      "4,1": 3
    },
    "SheetStyle": {
-      "FontFamily": 4
+      "FontFamily": 6
    }
  },
  "PageInfo": {
@@ -125,4 +280,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//N3L7PxgNVFUyCsxgQEHepFlB8wAjp3nP0v95+6+UqMApRkUztJzXbm83iEKoByCDOkoIXpKsBIy2lRDZVnhIKUWEXs0Ki4007sS5lcK5cEnh/mUI9du586UoTz2pzcMnW6a6C836BKwJhm+dC5HQpKL3sM2kl4ZDFC0vylGQk6IqeYtLs+x0KxcSJzR1JNfrsy8iBWs4A/cneZi3ezP/5ezVB0hvMsDA5VSxC8TqXdqm4pviERiFoxzExWiWMifi8eMr5t/PiiSRyLageBSZMXWXwFYskRI12ujfuxUfIqWkduuSjAWZFjFg4Hkfwa44Rebw8pgAB369jHacJOA3Gw2HvylhS6LLc3uX4a7kaELtxhGWoGKayknCfCoLP39d3G6ALHya/vey32tL0RnwLGeZWw9h9tgn28nxjvP76/7yYEeSI8JX6tTMPkGfDFa9W5p4b41W/HKGIMhv4HcbtApEmvZMydQQOY5B+FmsL4m5FnbSmKhbMQAYpTlPm9JJJgvhbwImsKvh8QLaFYCpp7OIqMbuOxJhQT6iU7EYUpnQbMyL5TqcZtCq+kjtnaoZG3Rf4V9R+JaOJYtXMVmK3TR/WKFB5gqyZR+A0Aeaxq1EEkIs/Z+1tCrTRPu0LGpA/Gi54zLKDN5ebNpJcJXQ5Gxh3yysHk8IYoFkxqKSk9YYssL4H7VFk8GEgVocBj3+lSAbcUn3fowb6xP3jgYDrO5BG0dV4jZctIaruLty+u6gPAwR0EWHZJozT29ZwhOyMVnC1x1wLNhVgxaOQpWelN7RMfmxJhB8cncrds9Gl3yGlzmTNnAu6iYKh2/eiASNBN1douxiE7luGgrEBjp4ch8DoCVL40h9KpbOepn4c5E0I7YIH+s3ZLKr3fppGtaXWt6P8R//22texpi9J5qC+Q==|920
+}//5cQdm0YGh5vayVTlRq2K4fsc9TaYnk1Vrh+pl32ls8Spu/RTSYZnVX/eLnYcOQnoEnv+pUJVuvreYmJ/9RdhbqIBQfJ+RHQjvuAITZmvTK6FGswkD0v6H2F8x5OlM6BG1PdAEMdVlHSB5o6UDbYNoje9E43djFnTM3kwtsMLOhP9aQZhnhgWGyVinyb8cjRdph/MmKP/Rz5CPOpoNOivIVnjrhnC0jUZEJ/wAbq0VH0ZHw0o2f1nhUFG9RTpGj/NKmUkJkHwY+8rcGvhvKGoG7jlQNFD/Y5Rt9wPohcaaOPXZ8kWy9COBqMHU+NdqMMD+lE0oCCMqoXX1JX9BwX/OZUtUYRn+4mAXyebbI8BU7O1kBhO63AHXU4NtB/F1yrKZrlVcRUYwIdiY7ZvNPZ1HZz6EqFMSjz7p1vzRV7BN+bM2prnflnSHc+4vWxWrQD6mjuTBm+uBjfLud9q6nplwj3VTbxkaDOrO+Go7J2xB5rHMMuf5WBv2mWu3HMnWm8iPeLk1JdqTkuI0PN0GC1X2aelCKFqQ/H6FG2z8fl5tEaxknSigidNOQWHrJpqQ+lFSi5yhpVpOmSoLiyIHsfhyO1+vyIA5X84K+EiT1XlwG3+QAQTMfIr/KxIq0eYhdp/petjjRBcSCQ+LnTKpTiHwy0bYOdcefunt71t5caqBZzD2kHZXCT6EpHJyncOE1Ioli5mKxsuaiGqHiQ9I7EPbD8oZxnU7/1xps7vxHrvqySpO+0qwmgUA3wuImKB3JsslyhiKAZAC7XlA5aGa7bFc3cpwYLDY5vipkRk8wSkEaIRlx6s9F30Botglx984jwNA3dYoC02fs+KxtvxMknyurUpwJy/PxhRKsbf0SGbEab0101ZHBz391lDBjdsPKzT2o27IZ2UvzYXbPk3Hb2rTA==|920
--- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json
+++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json
@@ -3,7 +3,7 @@
    "RowColumnAttachedInfos": {
      "0": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 15.0
+          "DesignLengthInPixel": 10.0
        }
      },
      "1": {
@@ -19,12 +19,20 @@
      },
      "3": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 15.0
+          "DesignLengthInPixel": 10.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 33.0
        }
      }
    },
-    "Count": 4,
-    "DefaultSize": 15.0
+    "InLogicalVisibleIndexes": [
+      4
+    ],
+    "Count": 5,
+    "DefaultSize": 10.0
  },
  "Cols": {
    "RowColumnAttachedInfos": {
@@ -87,6 +95,28 @@
    "1,4": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+            "PopupDisplayMode": 1,
+            "Placement": {
+              "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!E2"
+            },
+            "PageName": "右键菜单1",
+            "PassValues": [
+              {
+                "Source": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!E5"
+                },
+                "TargetCell": {
+                  "SerializeProperty": "=右键菜单1!点击按钮"
+                }
+              }
+            ],
+            "LoadBindingDataOption": 2
+          }
+        ],
        "ToolTip": "操作",
        "Size": 24,
        "TemplateKey": "按钮图标",
@@ -96,6 +126,17 @@
    },
    "2,3": {
      "TemplateCellSource": "执行内容"
+    },
+    "4,4": {
+      "CellType": {
+        "$type": "Forguncy.TextCellType, ServerDesignerCommon",
+        "SavedValidators": [
+          {
+            "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
+          }
+        ],
+        "TemplateKey": "_RS_NewLittleRoundCorner"
+      }
    }
  },
  "StyleDatas": {
@@ -113,6 +154,16 @@
        "HorizontalAlignment": 2,
        "VerticalAlignment": 3,
        "WordWrap": true
+      },
+      {
+        "Background": 4,
+        "FontFamily": 5,
+        "FontSize": 12.0,
+        "Foreground": 1,
+        "Formatter": 6,
+        "HorizontalAlignment": 2,
+        "VerticalAlignment": 3,
+        "WordWrap": true
      }
    ],
    "Types": {
@@ -121,17 +172,19 @@
        "Text 1 50",
        "Left",
        "Top",
-        "Body"
+        "#FFFFFF00",
+        "Body",
+        "@"
      ]
    },
    "CellStyles": {
      "1,3": 0,
      "1,4": 1,
      "2,3": 2,
-      "2,4": 2
+      "4,4": 3
    },
    "SheetStyle": {
-      "FontFamily": 4
+      "FontFamily": 5
    }
  },
  "PageInfo": {
@@ -142,4 +195,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//f3OStHsmi4lGUZMVLaSy6L5Y1oMPROrjEArPUl9SToMm491NjdlXTV65dw4gkiS6DVzIRc3ErMi9Ikn32zGo9o/JXv0W+c9+S+s3ZjhYs771sILmtpfaMLY4LSwXEsMlR3UkxNRdXOhM6UfoTtF8log2otFdVfYU3MkbOcco8BJtAjLH8mH42LInPvbIPOC+X4lEWJdP+ACshS3W5JeYEd14eFYXynsbHerNJjI+k+s7X6IjVvMFcmfBA9xfy28v44YZOfifTavv58flm8ZCpCfHPqmg4JhlKS1Hg1CltKpshkPrYxPmWSYlER3M5CTgGregD79sCsczHOcc6uTHJe2lnW41i15StQep806NTPaJDwOkEgV2j5sGLYzgrUjLJaV0ubRW2C2ev1ap9Wt9GRkNGbLPn8g6Or52NmFggBDp0xOJMqVLiHezDakrb90okeoFf7phFePag9ohehqmpboIcFTGjgYCwdPQWL5nWzVTZTorARSJoNY1ldmgf5ZQBgK2cwzjhilvJ8rbUVC6BwiTY5dXKxrCtTgg2r8IB1KMw9Oaxgvgqloltdw4w+VX4O6W7sNLH9h0FWErIOtY6gTDYABqK2g9iY+L3eNmMkicOzqqgAvONWXvSwT7Yvj/Y90cLJ5y0Af50SP+psA67z5/nEd+FTgF5UaY2gB5krCm23X1yc30sWaGA3Hgg6kbRKuqIa+G8//ZsIS9AQaasc1VIt3izuH3J3qQ0+BIzXim+uAFhQZ65SXiPSoQcgyVQI8axh+hfnAEsYSfYxB2E51VyXv79mUdrY0nJIfAX9kagPkTTHGFAmDKlbyHylBHD+QxcfSHTqSeTx+SWfF12R+c8VH1p822dp9vRco9UU59JtfOZirXIJl/iMURvl5JLoZ8bkXCsiR7mu9boJ37mw==|920
+}//lrAkh+ebfJQjpWqhtH5oFaL4LeVBTa5AdpvSA5ZaXGDceFr6fJGDHN3grxVLbnhjqOxvo1Me7HdTn40h89Ybq/mAtbZe87vDTniIJF6AnzI3cLMCB2kxn8i5A/n2LTEHuIRur+RTWEVcoPIoYQzhFRmSKN6ddJbAYWLMedYgryBpNjdVM/Fj5/q6qT6es+9LlZ/S8cOltBr8jPgPc3Khq8hAV99Tksf26mhdwplJywm3Qr1R9vRJas+3VZ8hHIEstfrQWU1fCGESwvYhs8kgSd65RYulFVKcYyc7iM3fS3VZHGW+7hr14lTo8m0FpjqmjfPNB+G2ONaR6bSGGndR3J/n+3VVKP6DqxWCLJ3vC0ctYuAVT1ljD6fisu/VxiwuSqFFiuYcHLvDZLIBZ/hZkQl5x5wRvIRJQLAHgq/vTbiyydadczAp330RrtyDaUp0mDhwtBhipYVRqzlQBj9DL+UXNEcWB6hZaC5xcu05eh2Zz7hGIboDeuB/VeBobowb2FW6MI3tbGLLn1VU1lx8T+kAYtUk0K/o0AY77jukhRkWtyq8x09tpzUHEPItMAaJov/bbq7VmDVJ4wgEISEe8PiWt78PnbqMi3j/iJQOhkQRWrUn2dzJXxH1pd+6tagrIb44FeOU66SI2PR5aHvTE0RtxlNgS320jvb8GLcvkf5l8c+imhkAjMNIrYo1eMaN9wL491fJRqnJgN4KsilWJIFzsGYNQoJ7ROiVasPWBy/IKNF6OBhRy92bG7589HJRmzNMkEzgiXcKpQ5CSf8DnA15QfkezzaQ134UIAH3A/FxYc6GkeQFWGkzoevy4JSllLFmFhgw1CFeep3BhfVWBwjzMHq+HrvY/n9ub/eqgEf65Jrgf0V0FLpyPn+ytH3U33mB+Ia1sYZgvOd/63ynIQ==|920
--- a/Pages/任务/任务-工时.json
+++ b/Pages/任务/任务-工时.json
@@ -197,7 +197,7 @@
              {
                "Source": "计划",
                "TargetCell": {
-                  "SerializeProperty": "=新增报工!L4"
+                  "SerializeProperty": "=新增报工!工时类型"
                }
              }
            ],
@@ -245,7 +245,7 @@
              {
                "Source": "实际",
                "TargetCell": {
-                  "SerializeProperty": "=新增报工!L4"
+                  "SerializeProperty": "=新增报工!工时类型"
                }
              }
            ],
@@ -332,7 +332,7 @@
            {
              "Formula": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "='任务-工时'!执行人&TEXT('任务-工时'!工时日期,\"m月d日\")&'任务-工时'!工时类型&\"工时为\"&'任务-工时'!工时&\"小时\""
+                "SerializeProperty": "='任务-工时'!执行人&TEXT('任务-工时'!工时日期,\"m月d日\")&'任务-工时'!工时类型&\"工时为 \"&'任务-工时'!工时&\" 小时\""
              },
              "ColumnName": "描述"
            },
@@ -609,4 +609,4 @@
      "Size": "894,52"
    }
  ]
-}//oZLVUVKJXKt0djD/4ou4aL8sGwQt6m0ls1+maH7iJ3/eW9mI5/xA/1ksBRv+MKPOBwnQ4NPjGed2ODh2KZw+Ep0Us5j0R5RuDHgpQM4j0ljNdbOzA0rT+61Z+BKdYRyJz0eimRzeOQ3JnvZZb8YSKeJlOm+3ULxuxPCMVp+DojXgJcWJEYOZcN7JmpSbSDKVqySlj5Zs5dOtSBGx8asHSFQbdzB30mEHs/g8HPaqti8Bjui923netzayoc/g9QcqyDxgeQZc+GO6WukcN2mnCb2VfIWTprhJQEu6v8bYl+vHlYGcrH6ykxDSO5eOcWrkPQWK1gmWS7AIs1c3kpOFEBaUvqIgauWSfusheWlMCvKzn2bkG4xrZOU/1zgb+17V4m+9WUZ0P7Kul9L19wJyM0DG3hRtp9cj4Bxn7YybXgd5xD0tB16+GqyXwcCVGDDEq6VBFknxGSVkx4LnSPhO/kFoo3+cCylqtB23VRCvYAnvE0WB9D8U7B3iWTaOH7FbaLeXp0M9J4eCHz5qS2b52C/qtS8ZJNat165pYM1zm0bZbAK1bh+vGQU4cNv/NfjpMAxHxrvQaS3MsK0AYn29s7DRkiRRa2DwBO71xo1mC6Plr332EY/Vzz8vfVhaTHxqUvQOYgwCvYqPlPle1txth5kXXcJ0Ds/J3qItR6Xf/MSNeW8NKhTgnrjim+ZhOkWLZRc3mAYEnpzpglkKy4J6ygEw7GChFl+z0Znek5Pheaz8kbEYXFMUdC0vkvrpNpjPc0CZoBgbbyItuwVnTB8N+zZmKNJcSHdg9q2itAa22M20kp6oRVr9jS1V1ByoeJw3V7jqv5TJkd5TKjqhPeYByqifv7uqGwb5CgkdImSIsIgmrJmpDQBM5kKc3H5fTgqPPfnLAPAQDn6MAi4ddG8vtg==|920
+}//SEFr1v+rU9PX+4I4Gx5s1hlCuAvIngRsiorE+6G/wBXgELhQOQfa2sgKCtbDS6yVddQmtRqObWCnZlygwRicnuFcAYCIcngO5/9im6KHndTPT43BOqGDMXEzsRKOC6oXlA/Nhr4lqMbkZwQc5wD7pdmgfKTffzTVYVTxqvlEeycdlfbISmW8FTuEF6XC9dw6Uoq3/bI4r8+dyk+RGNdg9WGUuckUZY7UHUe0y5CMGMUEeZfwJSAgpejhjrBt4VjiVmc/By48mDXAV/rG4ZGwc0uNsPJpLFWiykAXiLTMU5Z5KWwSvfb1jP6W5CssoMefQCjsh2/z6WXIAeAraOeuZBBOGf6HdtilIe0qnQCXdXI1A9y2j5sej+UW3mpYiFW+zrew4xX5fonnMWkBn3S7hCRmfHW+IfmwTlM3mEkwEo7F6iJxEhmfcKcdvJtEAyH3v5dlCQG+DQ7hcE7fR2YxBIZIyERRFZaJik+9X9j3VIXflC/sF9IgGjNhFqMJoojr6DB/5LOnX5HrZI9ebBLUOi9FsIEnizK494tDXcX1IG+bwxw1cY2lZ1YfohcE8EkT7JvzVOMIoh3aU2X2L+QHjjb9yp9rOdFjT9t/d3+80kQTX55xFfaVN0bzYoaqnoJP6YHzwjuZ5LIsV9CZvkVBiCmhed9aNj+dKhsD2nQ3t2gPpI7fPIburbLIbrtuViw318007KNTEqQqWzFZ/UN8DFogiJ/I11eTBs5vaCwvaz0fbx+a/E4KSXHlJk3cXybOSh7R/1Ls10qIcKbjwJE3H5Gt+2SSOWT4fZwAPh/N9TZF9u7+w6S0F5/VA0i1mzL/LNuw32ETaZ/hUiQDQRM2QgUDnwdtJsCjGB7dTYboL8JGWu0AQ4LbiQQOdQIMkY9ZVEEtWryVCe1LJdaQxdWDSQ==|920
--- a/Pages/任务/工时/新增报工.json
+++ b/Pages/任务/工时/新增报工.json
@@ -431,7 +431,8 @@
        "CommandList": [
          {
            "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
-            "Title": "加载中"
+            "Title": "加载中",
+            "VBalidate": true
          },
          {
            "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
@@ -554,7 +555,7 @@
                    "ReloadData": true
                  }
                ],
-                "ID": "776a9d7f-8391-4fc3-a140-f33eb3a6fab8"
+                "ID": "e5d8c3e3-5deb-4004-a0a5-785f0e04ee1e"
              },
              {
                "CommandList": [
@@ -569,7 +570,7 @@
                    "BtnText": "知道了"
                  }
                ],
-                "ID": "a87ca321-e070-465b-8dd2-9ba8d3d9408b"
+                "ID": "92026733-71df-4f33-b68d-aa4f9521d2e3"
              }
            ]
          }
@@ -916,6 +917,10 @@
    {
      "Name": "任务ID",
      "Formula": "新增报工!$B$23"
+    },
+    {
+      "Name": "工时类型",
+      "Formula": "新增报工!$L$4"
    }
  ]
-}//4vXL06d7vuOai9jLudocuGcK5uR6giRyEm2TWF2Hg4k8uKOieGDXIlJINJrHbM+j5ch0hY13MA8kCsVNA23zfO+DLfavrp9NotKTMSfrcBvQ/+5XmGcZ/5WxUwkzTxStuzaNdqTrC1vea/AdNjIS3i2J+jYItdzIthzOTuTVK/klt6vNZj4YkqybqkeuUtdwNRof68eb0pfWoBwayJ2FDQMN44/iABuo4WilSDAPLRGhlkC0/zhOwaewB1RLdYBaMM0wauDR6zdQfAhyClDGGvfDA24GVxTzy35i2utMHLN3KVuPaf42W1xl9QOc8swjKbyH6BRkL7Z/wrydum4YvzNNJdwfEURq7Ftw0+N5M0RYcVuyVqmaNFSPCKn970AyxCOV3/YO+7vxnhrKJuS4g01UcVqsGWjZKq6d2w9A4/EBiMFIaPRGMhYOGvHSrflN5nFBSJbCE+RPq6kWMXNne9dnULSW2iSWf6uNjBo0/8KwhGVRB5pB8Op1Sw/YZa/aIOydmWbvRJOs3aaxpM6zu4IOA+l8YZXuQcYqu0536AiJj17HXx4pnfI2QLH+uVq9Cq4TO8usxBRvG9mIKLcuElRNYHSBi0PfHl7gj92ienDE4GyaIwsfeS+U/LXr1SwZYVQtUPhFvB6yoko1n+J7n4ZgvAOwig1mESGopdD/h/3tyRJDMKFqLlF5jQrz/XBhPK/lYQHwJ3JKCcXXeJNb18c7HtZChzXvo26gXkVifo/Dvirb65Xhsjrtb7JhThD+AvrpdBlgx4gBBWT9DGSX9dXV9eBk9JDjmQ7k45GsOtMb+WgkRnpeDeYBfFtzVs+JtLXJviNlcttTiQQfiDalwv1UfaoP+2HdSY6jsZOfUEx1N/aEcVdzdYl1ZXhl10Y+nqqfi9FSnesEWnvWqyEKkA==|920
+}//L4IgymNu3sUHENSPB5NpdasyYafSjJwz5xXidmuE1By1fzVNBM5oBbWWY9PY/cnZCBQKDoqmUa74aKP6hChIViKYHfkBTbE8ScZZuOBX+XXcCMyqNXn+qCZjeh3vWHzmyeUrfKkL3hwOanPqFSSuDpldFij0WImT4rB5WuHQwlPo764/cKnLCfFTdQ3Jj1DOkxvHZAxH8lAL6+k41hpBglTU7zFOF4h56zlDu2wYF1H/B6TVJmhM+jcMezvNKd9VyWIiCVRQa4sHnbNp2+GRoyu7ZILUJ7as/Wo1htacuDakJPtWb1LnoKEyB35zaSsr6HxL3034c0768NR48bUsOoxS7qXaKuSInAj7qN9wPqZOJDYE6AMU4AyuVlfHdfQzbcJNt9xYwPeFIGjZoFo0EtlPOfUu5Z2USDiJa9MtDcGhIYKLzqNcBkG8TIg+7VPwNQE8mjHNewFEztT7hEmFrMErxoniM9YeOn1Vk7oq6CWbmbuQSqgInDE68HeX09cv2m+PEetW5gSyWS5MX/T03DFBsVNfSRndHYnj5Z7rdbm8D1pRzhcBvgaWx/tRZDX/QccsxPJjgnmQ1XXHOI7Kfwcd3hy4e2KXorwWO8lH9zav/We9rbPy0qnqVGxalCeRTUTlDPfYBkKFtTGxjFmO2d7XUZQBPwsxYJbS0Yz0G8NZTDQqXUIIbC8nnlwUpmzWYgWCzDwg1Psf5DJJjOFiFBPc4RTYDlmCzE9ZPYh7Jp719jxepts1tCyN7rHqgEpmXx4zRfPsPy+vrk/T7o3cYEVrMkwaBmovevy00eJmZJmLkrJj8bKrdrb6z5Adjw9YmnKT2cq9JZdL3UFyg5z4h88XfRjBgeYEvwnjRqRF5QCGThbkWaVafmvGI8kV49aH3mwO4y46TgokgGuo/HGHNQ==|920
--- a/Pages/任务/工时详情-列头.json
+++ b/Pages/任务/工时详情-列头.json
@@ -31,7 +31,7 @@
      },
      "3": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 291.0,
+          "DesignLengthInPixel": 208.0,
          "Mode": 2,
          "MinLength": {
            "Unit": 1
@@ -43,21 +43,32 @@
      },
      "4": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 121.0
+          "DesignLengthInPixel": 120.0
        }
      },
      "5": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 121.0
+          "DesignLengthInPixel": 120.0
        }
      },
      "6": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 159.0
        }
+      },
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 75.0
+        }
      }
    },
-    "Count": 8
+    "Count": 8,
+    "DefaultSize": 120.0
  },
  "Values": {
    "0,3": "执行人",
@@ -117,4 +128,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//MZ291KNN/tlPsllCznmHbxmizls9zkWIWYMjWRbPL1WJSIRNH8L5B99ucA1fesSmUG0jaVREYhKEuwDhkVEzoC3+tleR2Lb+f4Ugy9s45s8rSHSVxJa0uU6BTeq8bUIQXCJfMq9CG2rwpBjhiwh3WgDZB7QjxtEoGcxO3axP1bVznO/TYvthKV85ir9FUJkgdMFdGoL+L3m1FEzhIUiQ2WOWrBdXp6d/N4t0tVSUOHid8+EtwLFOqunmH1zpr60Ugu7RNb6NO9YvIV0xUrDzw08ZHWf2h4kBgQFPs7Ywd5F4C8mi5Zr0fCNaW4it34JGWIGyGm6mAbwW0eMJKL3zEtIEWPe4LhvslwU8zk2N78FBeNTLoLI7nmJfauwr5Hc3szXLyFO1HZa1//77Ck3g8E40O4LCwayLAf4eSYw5fzykudgZWEm10VyfKPSJ8xRhF++mextSpZtk55efnzpibfmGOscz4QRNTPX6cMJsrdCmhGEmBr3Zhcb2cuLvCk5B+AHtAL4ztIh8ds0Zfva4DPK+EqHPL9YPllVfGEy5pvzpv69+qnd6nazg92082QQFRGDKZlQOgBJawA5tKI43csC7PLWfuiYgcKh4Wg9A8XQziC09NPwjuJbO4l4nCCOHNMny1NbqlSnyBF08ZROLDNZ7TeiS/fQiamvDNWpMjBMQhePKPxkYgnmmgSHsJ3fNvcS3cU7FwB29dSF3i4AyV48fy7hiR8AJhkdQdjie2EjTcw5iBl/9zgqTbhuQVkAXddnkhR4uNYKNUK05n+/jJo2ZHfsUD/2qZqf9v12035IHBG+ZtJhkJYuNjSUvI46fMzXfXmoW2iIPu/EIQjZS7TFymYa+UDtveZlkWtaZiqFG72xb6zzIWcwEWtU/FYZYVQAEGhQviBUk/KQs8HVzCw==|920
+}//pVWzwweQDAv+brGX0sIQS7Hw7uPMZZDI8dkGRYOfDmIsRH9OLbIesQRRKDUjBdr3gen7brfHe6yn+hwguYKVkvdXyOuT/bsbr2djOD5R+PK44KEHUQ9oj2t50QerncfHRdCDLX6FsZw+RSa8lg6nAr1kGPqI9klr4JsO5hp/cs2rCzzDbwUQlbImPzRyL5lPCruwFJf6VpLxUHJwWkEZF/uQVLlpanK3n2UsMMunHkpK5UnPm2Dyg96DoG/5KUzbuCiDA97MGHNxa435tXdwiMi3IV8fCwe9wHGZpzzzj649zhpt6eSeiztEibc8c6buzQsOarGtiWFJFIthO+NbWZhYpQe30Po8PNXWpcsGpAUm8JbnDhtSu/8vSc182htOoch36w5hHljaG+RrmDfYt3RszPvaVrM9mNsiucz8oolv/8Lg0lZ6jFiy+EJ93iAkVPD7zpkH3fh3pIIqBB69mOOCE/6g/RvUfQS/d8zDQMkRUbza/LkvM71sXrSrXrcu/PYeMZToiMyNkIa7d89guNGh4X4iOSJjQuaBjZW2XZ3MCe0siCKnSe9f5IZGOHCrlcJHP5MmH0nPoRgeW8s7urLjk5fbH/wRGoPTzt32T1En3gX6UfQCVSW3CyLlAlm3W5A/4fdwDSwjJKrTca2XgqghTlUWTbtTSHjEQtRtHLragsopKRcdqNJ540LE/bsG5vimrItkIO/doWrIP6ziu+MbgITMiuaWOD1Hw01pUaho9Q76Q5VCbI3qSs65zWXQcAjDCp/rtFCHGI65HOu4H/KZTKV/qqpNUlWH9ieUB3gIen7MKoMnSdFjQlj5I0uPWGGso5ud4/8WAYJtmyuIXn9Twqv2TbkOltTbuoY9MpbYbm+V5VFfiXUkhsSyF3Q6FLeOeexEejHT1xPUtfnW+A==|920
--- a/Pages/任务/工时详情.json
+++ b/Pages/任务/工时详情.json
@@ -228,7 +228,7 @@
    "10,14": "实际工时"
  },
  "Formulas": {
-    "3,17": "K4/D4"
+    "3,17": "K4/D4*100"
  },
  "AttachInfos": {
    "3,3": {
@@ -253,15 +253,6 @@
        "showText": false
      }
    },
-    "3,25": {
-      "CellType": {
-        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
-        "Size": 24,
-        "TemplateKey": "按钮图标",
-        "ImagePath": "更多.svg",
-        "UseCellForeColor": true
-      }
-    },
    "7,1": {
      "CellType": {
        "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
@@ -322,23 +313,23 @@
            {
              "BindingInfo": {
                "TableName": "View_任务工时统计",
-                "ColumnName": "计划工时",
-                "GUID": "6f1b5dc5-beb2-4184-b8f3-f1cbbc9b83ca"
+                "ColumnName": "总计划工时",
+                "GUID": "5c7962d3-0bf1-4eff-a603-59b43df0b807"
              },
-              "ColumnName": "计划工时"
+              "ColumnName": "总计划工时"
            },
            {
              "BindingInfo": {
                "TableName": "View_任务工时统计",
-                "ColumnName": "实际工时",
-                "GUID": "79613874-e7a8-45df-bb7d-f978e80cd4a3"
+                "ColumnName": "总实际工时",
+                "GUID": "f3031096-d234-4bca-9130-c455e8ca7f03"
              },
-              "ColumnName": "实际工时"
+              "ColumnName": "总实际工时"
            },
            {
              "Formula": {
                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=工时详情!实际工时/工时详情!计划工时"
+                "SerializeProperty": "=(工时详情!总实际工时/工时详情!总计划工时)*100"
              },
              "ColumnName": "完成比例"
            }
@@ -374,7 +365,7 @@
              {
                "Source": "计划",
                "TargetCell": {
-                  "SerializeProperty": "=新增报工!L4"
+                  "SerializeProperty": "=新增报工!工时类型"
                }
              }
            ],
@@ -403,7 +394,7 @@
              {
                "Source": "实际",
                "TargetCell": {
-                  "SerializeProperty": "=新增报工!Q4"
+                  "SerializeProperty": "=新增报工!工时类型"
                }
              }
            ],
@@ -675,4 +666,4 @@
      "Formula": "工时详情!$E$13"
    }
  ]
-}//wpfwqLRVD7V6aMwi/ujNEkRzmB99x7fZre3K03sCVKwsmkKN+GlNCEuFPW+USS7/H8aQB/bCLzQVZoM6HOq3KF7S10aXAPJA1qqcyrRWiPmofI63bem0BJFW4bgsS00vd2KeqhV9xpFR4prQ0NgXmsO20QnVWc16rDkgP5KYY8wgAw1xBvwYvfKsjPpp5T0Df5zXchq8AVIpEYR9zUSzGJOk+nzuOTNyBDDVjIatCrvknrB98CnQtm+9IUIB/IuoubFDCj62sSN61910lRus5jpg6IwZqJuU6GfDOJr16RQDXHjb/8xTrniJGGjeOdsUiJcxnPSj97HiU0D1un2dSaxgdOkTbtUc0RpJ9Zi7qCLrbUcbSWqxc5WQjI+onzHKgsxonmC+0Y/XkmuG1Zl9cdb2MB4Dc5/k8YRS+oADHT25NPZS3meDeW9TMLQEC5xVEiA2HE861t9QVUofR5j5HLYUDxj9TIOORtmV5gPIJ2jeUpF26qwJha00BenlN9Adn5McMhZOxWyuSBUaKQSDSzsuqOc2IF8/JdG9ntl7QXbloHMlFIBm1NhKj3Vz7IAkEJCXqXVFtMXXEsjMcQxTfG7Z09ouWPVxO+FxrUz/Q5iwPMyX9fpmGzcfOC7ikxHK7pjqzcz+XAb4q/u7YUTO9sePhXaWOHjPUpX3TdOTiVuziz1BIOPNwEGmrgrYYTZh/qkb6AbW+hu1n4UQ8s98QxF1jj+NIGZwx5SjZLsq7o5hTo89M0ulUoUEZmHmgmpw7FVzzzlAmFnup6bcxkADYKtNgkhl4dazUMiBfp0Ig3O6n0rJBom6EYdwgK5ESsapKNoiXd1AgrSjmxh1YpDkshyzxRvan0wTRRCY329kAyOrtAupevKF9suoBDQIIaDMabdfOZt+/n1xhN96hjWNvA==|920
+}//icA8ck23UcbnGHrDqi4LnGpaxu9WTSDmffntsET7aCjUMIM3JYmfVApkzcMVkuQMBGZvFOrqvjjCJXX5tBX8jrV86FfIC68In8CF7TCY6huzvCNmPrnZ5GH7Eo02sGflbEqJwr2qFbZImXOR2v6GcUA6ImZWfvVNrULz5UFikEtG7g2tpAqO+o5mJsZs4fmbE7kw9I5GDDDndLfIuJuKGsDXDtTih7ZnkgB+LJr1wk3SVtxdhR3BNVgKdHeA+6JF6R1l6r8aWMRnF8GU5wVVXJP/AFECd4JHMEiLogtlb1xPO9RwT9uGtU3x4uHDxljUaPK8hAeGiux1jphQRjwRBqrmUHH4c2o7fl27U0nUfO5mqew3HXe8BPRP7h5//LF6x3Ef1lv1h2vZSHXgzh74eoWoz8ukDrX2Fi8TcJVCB6dY5/AuoR+30WPQne1u1dWyme037uTgHCHPF4S3u/7hP5RZaM9qv1p/jFL6gm4vAJDxoBRMe6TCYrKzyRiG6CnfuoFshVthI+6zqQfaVa6dQFjOoOGSwbAQYYiIDXP0BVRgWb8SQEQ+E45Yzut84+LdWZb7F4mW7d4e4uuh9a/V6cw5wX5D8wBRO+9D4lDW8YEi/fxHobYs9Lpthty+JqrZVMb2Sry82Xbu279LYxTY2K6AGl2f/L5GgYmnPNk/UO8tfAv+ThHayKeK17QeLlyzdM4sHB02TPOf4V+nmg2Bo1SVbKZ6DNNexXbt8gzFn9ubsGQwHw85C6rDLAUu8G5qcheiNt/4ooWCSbSIUZfrPULHDReg/g5WQ+vqOJQessTbpOoxYXjCqYCUhLFjNG96sbb1ali4y/Qsayw71lk9EjhsksiWDJiulE/9E/JEwCz8PXOsdPGFRVNJlzFOtE42oncCK2WDjTteO26Ip1eWNQ==|920
--- a/Pages/共用/右键菜单1.json
+++ b/Pages/共用/右键菜单1.json
@@ -0,0 +1,170 @@
+{
+  "Rows": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 38.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 38.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 37.0,
+          "IsHidden": true
+        }
+      }
+    },
+    "InLogicalVisibleIndexes": [
+      2
+    ],
+    "Count": 3,
+    "DefaultSize": 38.0
+  },
+  "Cols": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 11.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 152.0
+        }
+      }
+    },
+    "Count": 2,
+    "DefaultSize": 11.0
+  },
+  "Values": {
+    "0,1": "编辑",
+    "1,1": "删除"
+  },
+  "AttachInfos": {
+    "0,1": {
+      "CellType": {
+        "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+            "PropertyItemsList": [
+              {
+                "TargetCells": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=右键菜单1!点击按钮"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=右键菜单1!B1"
+                }
+              }
+            ]
+          },
+          {
+            "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+            "PassValueBack": true
+          }
+        ],
+        "Text": "编辑",
+        "ClickMode": 1,
+        "TemplateKey": "_RS_Information"
+      }
+    },
+    "1,1": {
+      "CellType": {
+        "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+            "PropertyItemsList": [
+              {
+                "TargetCells": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=右键菜单1!点击按钮"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=右键菜单1!B2"
+                }
+              }
+            ]
+          },
+          {
+            "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+            "PassValueBack": true
+          }
+        ],
+        "Text": "删除",
+        "ClickMode": 1,
+        "TemplateKey": "_RS_Error"
+      }
+    }
+  },
+  "StyleDatas": {
+    "Styles": [
+      {
+        "FontSize": 13.333333333333332,
+        "TextIndent": 8,
+        "HorizontalAlignment": 0,
+        "Underline": false
+      },
+      {
+        "FontFamily": 1
+      },
+      {
+        "FontFamily": 1,
+        "FontSize": 13.333333333333332,
+        "TextIndent": 8,
+        "HorizontalAlignment": 0,
+        "Underline": false
+      }
+    ],
+    "Types": {
+      "Strs": [
+        "Left",
+        "Body"
+      ]
+    },
+    "CellStyles": {
+      "0,1": 0,
+      "1,0": 1,
+      "1,1": 2
+    },
+    "SheetStyle": {
+      "FontFamily": 1
+    }
+  },
+  "PageInfo": {
+    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+    "PermissionData": {
+      "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+      "permissionResource": {
+        "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+      },
+      "permissionBindings": [
+        {
+          "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+          "roleNames": [
+            "FGC_LoginUser"
+          ]
+        }
+      ]
+    },
+    "RowBreakLines": [],
+    "RepeatRangeSettings": []
+  },
+  "PrintInfo": {
+    "PaperSize": {},
+    "Margin": {}
+  },
+  "CustomNames": [
+    {
+      "Name": "点击按钮",
+      "Formula": "右键菜单1!$B$3"
+    }
+  ]
+}//6dRai+4lxGJO0i+D2UmA+qwn9UOIY8jaKVYXXLzFxiwx8TczJJs8MrfFskcBNY5mbkGSfpqE3oT/ln1sHY6iVLeNWpRDXGWRb9LGPWRi83upyVILtV55VLhTU7gtRQHWmcQ3BXsvYFvrOAdP+1aTU5k1WzLuUxIHPregEo1soPAkzbA3COQhCA9mAI+sHFQGsUM+tCrg0T3OPuT9RiX+bQ6PVbXchc7d3Gswl+eWlw8JtkWe3M9w9//XjAMS8LWTjxqXepqGQbnkWe97WwA3BqlyIggJHnHnxMz4yp/ngskutAXBJTrH/4wQ0/lFF6dO6A1kcKbC4nw8WdLjzuDWJx9c1Pg/sNcLbxiuQhn4XwC76uJ5S/DkGlClJ+jDv+lx6q6Y59neVY5wDjwsFuBRRcDaWgjFexiNnxIFSgKaQ386SIRIkcH5Le736JkNTPlYDTNb61fJUPA2kcunjT4N2jCfR0JSPKxZLKBCpNKUx8GA3z3T5tpqx/4ATkYpx/VsTpXOtkZjNd1t9aWLbxPu/XQeiI/LgjI9u6/2UtshC7RnUlsP4WG1qO6DR6Xs7ZKwSDr6migEhY+3A+p0FzqZb8tAx1rh4bOlT+WupD+S2fIroTKTRylEfQYQfj1Z9kWp7aCdawrAtBojJVf9gsFAFKWy5ZCAGDSb4Jy58PYENYWxO6zxHhcRO79tYJtj3sLnsWZT3FdSZ5FSLiLDw10o8xPOHK4q5FQgc8aN2KlJZncPOeVfTarWK0YwhvWL3CqtBgm2wUfVoX7P0yFPIirX4iMYW8pbbvIEFRtf+vEpWAobvyspCvf1UGM3N/Lat56wGWrKmD8C62UUtje57otsHBCvNHEUHXWaK8riVQPsMDgHBwGyoYAPMjm+2hHkZ7wTXMavyr2s1LAyp/7I0c8hKA==|920