{"Message":"重写部分工时校验逻辑","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/任务表"},{"State":1,"Type":23,"Name":"TableView/反馈收集任务匿名视图"},{"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":15,"Name":"ServerCommand/修改任务预算工时"},{"State":1,"Type":15,"Name":"ServerCommand/上报实际工时"},{"State":1,"Type":15,"Name":"ServerCommand/分配任务工时"},{"State":1,"Type":15,"Name":"ServerCommand/计算报工数据"},{"State":1,"Type":15,"Name":"ServerCommand/任务发起流程前校验"},{"State":1,"Type":28,"Name":"ProcessItem/新增任务流程"},{"State":1,"Type":1,"Name":"PCPage/页面反馈录入"},{"State":1,"Type":23,"Name":"TableView/项目平行视图"},{"State":1,"Type":23,"Name":"TableView/任务平行视图"},{"State":1,"Type":28,"Name":"ProcessItem/项目立项流程"},{"State":1,"Type":15,"Name":"ServerCommand/项目流程发起前校验"},{"State":3,"Type":31,"Name":"UserControlPage/任务统计信息"}],"Version":"v1"}

2024-06-20 14:34:51 +08:00
parent 85bafaef4b
commit 8a4a964bee
33 changed files with 1740 additions and 1681 deletions
--- a/Pages/任务/任务-基本信息.json
+++ b/Pages/任务/任务-基本信息.json
@@ -58,7 +58,8 @@
      },
      "13": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 38.0
+          "DesignLengthInPixel": 38.0,
+          "IsHidden": true
        }
      }
    },
@@ -120,6 +121,11 @@
          "DesignLengthInPixel": 32.0
        }
      },
+      "10": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 93.0
+        }
+      },
      "11": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 32.0
@@ -145,9 +151,14 @@
          "DesignLengthInPixel": 32.0
        }
      },
+      "18": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 55.0
+        }
+      },
      "19": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 209.0,
+          "DesignLengthInPixel": 600.0,
          "Mode": 2,
          "MinLength": {
            "Unit": 1
@@ -156,16 +167,6 @@
            "Value": 1.0
          }
        }
-      },
-      "10": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 93.0
-        }
-      },
-      "18": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 17.0
-        }
      }
    },
    "Count": 21,
@@ -185,7 +186,6 @@
    "11,10": "任务预算工时"
  },
  "Formulas": {
-    "7,19": "L12-任务总计划工时",
    "7,2": "项目ID"
  },
  "AttachInfos": {
@@ -290,13 +290,19 @@
                    ]
                  }
                ],
-                "ID": "dc3f9f81-16cf-47df-9d55-c03b0b867cf7"
+                "ID": "3751fe65-18a1-4cee-9795-3902993428a3"
              }
            ]
          }
        ]
      }
    },
+    "1,19": {
+      "CellType": {
+        "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon",
+        "UserControlPageName": "任务统计信息"
+      }
+    },
    "3,2": {
      "BindingInfo": {
        "TableName": "任务表",
@@ -418,7 +424,7 @@
                                          }
                                        }
                                      ],
-                                      "ID": "bbe0fc41-e472-4c3c-99d9-9e53df6f1b9e"
+                                      "ID": "721d0fc7-c9bc-45d3-92be-b636eacf0587"
                                    },
                                    {
                                      "CommandList": [
@@ -433,12 +439,12 @@
                                          "BtnText": "知道了"
                                        }
                                      ],
-                                      "ID": "fd00cba3-fc58-46ac-92f0-d28d4955b723"
+                                      "ID": "cac790ce-4101-498c-bc5a-30c13d0bf130"
                                    }
                                  ]
                                }
                              ],
-                              "ID": "a81ce2ba-1ffd-4b95-a067-714ccb975f74"
+                              "ID": "84d5385d-ee02-40f8-a834-5c4ecb957098"
                            }
                          ]
                        }
@@ -451,7 +457,7 @@
                  }
                ],
                "Comments": "小于进行中",
-                "ID": "a026e706-c6d5-4ba2-9da8-c526e9d123f2"
+                "ID": "2ecff11d-b7a9-4b2a-bfdb-67c1aa6ae5f7"
              },
              {
                "CommandList": [
@@ -461,7 +467,7 @@
                    "Message": "任务尚未审批完成，不可修改状态"
                  }
                ],
-                "ID": "19dd02f1-7911-45cc-88b5-ceb54809b02e"
+                "ID": "e3ce004b-42ba-40b0-9d2d-370a1da237a3"
              }
            ]
          }
@@ -559,7 +565,7 @@
                    ]
                  }
                ],
-                "ID": "a4ba347a-65cc-43f4-b345-494a5d972494"
+                "ID": "f9f47166-8509-48aa-8693-2bdaa5a0b42d"
              }
            ]
          }
@@ -641,7 +647,7 @@
                    ]
                  }
                ],
-                "ID": "995c9f4e-e3c5-4e8b-860a-4c4b771f6d96"
+                "ID": "e523a2f8-ed6e-4759-a8ba-60aba629855d"
              }
            ]
          }
@@ -792,7 +798,7 @@
                    ]
                  }
                ],
-                "ID": "fc9381da-82b5-4ab8-8865-8f4502c69f9f"
+                "ID": "eeb46e7b-1986-4481-b079-fc24126e85f5"
              }
            ]
          }
@@ -889,6 +895,7 @@
      },
      "CellType": {
        "$type": "ElementUI.SelectCellType, ElementUI",
+        "CommandList": [],
        "UIPermissions": [
          {
            "Scope": 2,
@@ -1096,7 +1103,7 @@
                                    "BtnText": "知道了"
                                  }
                                ],
-                                "ID": "22f0c50c-8e90-4657-b3c7-a86386b9cc54"
+                                "ID": "dc4329a0-ffc9-41bc-b3af-3fe09dc5001b"
                              }
                            ]
                          },
@@ -1110,7 +1117,7 @@
                            "Title": "计算中"
                          }
                        ],
-                        "ID": "b6a07399-4184-47dc-ad25-d072b12c48c0"
+                        "ID": "03f935c4-b172-48d9-aaf3-2bd9fb76e6de"
                      },
                      {
                        "CommandList": [
@@ -1147,12 +1154,12 @@
                            ]
                          }
                        ],
-                        "ID": "f38c9f4a-9c66-4762-9deb-66f66eb60537"
+                        "ID": "4ab90d43-cb0a-4542-9e22-612da17423e0"
                      }
                    ]
                  }
                ],
-                "ID": "613a0a20-ddda-4604-9f70-a52e0c899a63"
+                "ID": "0917de94-db17-43c7-b175-5b3dc6657009"
              }
            ]
          }
@@ -1304,7 +1311,7 @@
                    ]
                  }
                ],
-                "ID": "e2eeeb77-ace1-4c19-824c-a9df455ac0b1"
+                "ID": "2b06ad40-dba1-492d-97bb-bd31ac2422e8"
              }
            ]
          }
@@ -1412,7 +1419,7 @@
                    ]
                  }
                ],
-                "ID": "2fe5aa02-0539-48cf-bf57-c8569be06aa1"
+                "ID": "96059599-eabb-4d90-b8c3-d7ce1cc1406f"
              }
            ]
          }
@@ -1520,7 +1527,7 @@
                    ]
                  }
                ],
-                "ID": "58e58da8-1bc9-4f52-9cca-017cd5ccc0f0"
+                "ID": "88a2effd-bc0b-4b2a-b4b5-cbb8899783c6"
              }
            ]
          }
@@ -1660,7 +1667,7 @@
                            "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy",
                            "Cell": {
                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                              "SerializeProperty": "='任务-基本信息'!任务基本信息"
+                              "SerializeProperty": "='任务-基本信息'!预算工时"
                            },
                            "Title": "校验中"
                          },
@@ -1728,7 +1735,7 @@
                                    "BtnText": "知道了"
                                  }
                                ],
-                                "ID": "7c024a44-4f58-4fd2-bbdc-7e9729d8a65b"
+                                "ID": "48054c55-0a91-41ee-b457-c7065c6c604f"
                              }
                            ]
                          },
@@ -1737,12 +1744,12 @@
                            "FunctionName": "remove",
                            "Cell": {
                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                              "SerializeProperty": "='任务-基本信息'!任务基本信息"
+                              "SerializeProperty": "='任务-基本信息'!预算工时"
                            },
                            "Title": "计算中"
                          }
                        ],
-                        "ID": "716b3e15-b827-4a15-a4a4-f5c5b831899f"
+                        "ID": "b0f7ad95-d4c0-4960-95d6-afb9489c0baa"
                      },
                      {
                        "CommandList": [
@@ -1778,12 +1785,12 @@
                            ]
                          }
                        ],
-                        "ID": "42192862-4af8-42e7-9e4b-c66d25d0f1a3"
+                        "ID": "c25b3afc-b452-4cbe-907e-69782d041540"
                      }
                    ]
                  }
                ],
-                "ID": "cbe5d781-c5d1-4562-ba15-22f8b0ecd395"
+                "ID": "6660222c-5119-4b03-8c03-e6a3cfb92ab5"
              }
            ]
          }
@@ -1818,50 +1825,34 @@
        "Formatter": 0
      },
      {
+        "FontFamily": 1,
        "FontSize": 18.666666666666664,
-        "Foreground": 1,
+        "Foreground": 2,
        "Formatter": 0
      },
      {
        "FontSize": -1.0
      },
      {
-        "FontFamily": 2,
+        "FontFamily": 1,
        "FontSize": 13.333333333333332
      },
      {
-        "FontFamily": 2,
+        "FontFamily": 1,
        "FontSize": 13.333333333333332,
        "Foreground": 3
      },
      {
-        "FontFamily": 2,
+        "FontFamily": 1,
        "FontSize": 13.333333333333332,
        "Foreground": 3,
        "Formatter": 4
      },
      {
-        "FontFamily": 2,
+        "FontFamily": 1,
        "FontSize": 13.333333333333332,
        "HorizontalAlignment": 5
      },
-      {
-        "FontFamily": 2,
-        "FontSize": 13.333333333333332,
-        "Foreground": 6,
-        "TextIndent": 15,
-        "HorizontalAlignment": 5,
-        "Underline": false
-      },
-      {
-        "FontFamily": 2,
-        "FontSize": 13.333333333333332,
-        "Foreground": 3,
-        "Formatter": 7,
-        "TextIndent": 10,
-        "HorizontalAlignment": 5,
-        "WordWrap": true
-      },
      {
        "FontSize": -1.0,
        "Foreground": null
@@ -1873,13 +1864,11 @@
    "Types": {
      "Strs": [
        "@",
-        "black",
        "Body",
+        "black",
        "Text 1 50",
        "[AUTO]General",
-        "Left",
-        "Accent 1 0",
-        "\"待分配：\"0.0\"h\""
+        "Left"
      ]
    },
    "CellStyles": {
@@ -1904,7 +1893,6 @@
      "3,16": 3,
      "3,17": 3,
      "3,18": 6,
-      "3,19": 3,
      "3,20": 3,
      "5,10": 4,
      "5,11": 3,
@@ -1915,7 +1903,6 @@
      "5,16": 3,
      "5,17": 3,
      "5,18": 3,
-      "5,19": 7,
      "7,1": 5,
      "7,2": 3,
      "7,3": 3,
@@ -1934,10 +1921,8 @@
      "7,16": 3,
      "7,17": 3,
      "7,18": 6,
-      "7,19": 8,
      "8,0": 3,
      "8,18": 3,
-      "8,19": 3,
      "8,20": 3,
      "9,0": 3,
      "9,1": 5,
@@ -1946,11 +1931,9 @@
      "9,10": 5,
      "9,11": 3,
      "9,18": 3,
-      "9,19": 3,
      "9,20": 3,
      "10,0": 3,
      "10,18": 3,
-      "10,19": 3,
      "10,20": 3,
      "11,0": 3,
      "11,1": 5,
@@ -1971,7 +1954,6 @@
      "11,16": 3,
      "11,17": 3,
      "11,18": 3,
-      "11,19": 3,
      "11,20": 3,
      "12,0": 3,
      "12,1": 5,
@@ -1995,15 +1977,15 @@
      "12,19": 3,
      "12,20": 3,
      "13,0": 3,
-      "13,1": 9,
+      "13,1": 7,
      "13,18": 3,
      "13,19": 3
    },
    "ColStyles": {
-      "1": 10
+      "1": 8
    },
    "SheetStyle": {
-      "FontFamily": 2,
+      "FontFamily": 1,
      "FontSize": 13.333333333333332
    }
  },
@@ -2013,13 +1995,13 @@
    "1,1,1,17",
    "5,11,1,7",
    "3,11,1,7",
-    "7,19,1,1",
    "7,2,1,7",
    "7,11,1,7",
    "11,2,1,7",
    "11,11,1,7",
    "9,2,1,7",
-    "9,11,1,7"
+    "9,11,1,7",
+    "1,19,11,1"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -2049,7 +2031,7 @@
                }
              }
            ],
-            "ID": "1d213a1d-3908-4e5b-b76c-59b730ccbbd6"
+            "ID": "53468bbc-91cc-4c9f-8b20-7473594156e7"
          }
        ]
      }
@@ -2151,6 +2133,22 @@
    "Margin": {}
  },
  "CustomNames": [
+    {
+      "Name": "父任务ID",
+      "Formula": "'任务-基本信息'!$L$8"
+    },
+    {
+      "Name": "结束日期",
+      "Formula": "'任务-基本信息'!$L$10"
+    },
+    {
+      "Name": "开始日期",
+      "Formula": "'任务-基本信息'!$C$10"
+    },
+    {
+      "Name": "里程碑",
+      "Formula": "'任务-基本信息'!$L$4"
+    },
    {
      "Name": "任务分组",
      "Formula": "'任务-基本信息'!$L$6"
@@ -2159,33 +2157,17 @@
      "Name": "任务类型",
      "Formula": "'任务-基本信息'!$C$6"
    },
-    {
-      "Name": "执行者",
-      "Formula": "'任务-基本信息'!$C$12"
-    },
    {
      "Name": "任务名称",
      "Formula": "'任务-基本信息'!$B$2"
    },
-    {
-      "Name": "父任务ID",
-      "Formula": "'任务-基本信息'!$L$8"
-    },
-    {
-      "Name": "里程碑",
-      "Formula": "'任务-基本信息'!$L$4"
-    },
    {
      "Name": "预算工时",
      "Formula": "'任务-基本信息'!$L$12"
    },
    {
-      "Name": "开始日期",
-      "Formula": "'任务-基本信息'!$C$10"
-    },
-    {
-      "Name": "结束日期",
-      "Formula": "'任务-基本信息'!$L$10"
+      "Name": "执行者",
+      "Formula": "'任务-基本信息'!$C$12"
    }
  ]
-}//wayzYEdSmQUOAmzQruVPB8BBnVbrFPtgmpFr1z+RKtnoykkSV3PPn8fPrcXbb82GC/B+8IRchRKacOpRNBZRx6mY2dX6J2sdBeEpBx1+RDNehdGm4vvpO6TEP/Wb0ukGp5VoYd1Wb1f5VSnmyjVq4cweCMyo6qo94aIaKhKb0BVt2hOgJjG93LVduFPAODnaeZ0hE2FUkJxLDEf5bAavOtdlutSqm2I8+PzUv3RriVPrUvkOuwbk7FAAG8ZSbeAt7O15e+fwtQNdrzs/Px5MEiViASA8MawaI+fnM9znWdclIKN+8WtQuDMPzBrQZinsL9K37mdfbk8p9PUnfrt1xedrV1tUrj7htnx4BHnrznHXEiRnXuhQeVkyD7Tn/DBlk6/K09ZsNXWBvL85ztGgVvPy74DWHpj8Bwew/zVvXamkRlh4UY/HIFQMiJaYs/Q+f96mUzZHDWvBzfxYvbEIra4+OdSpIpSy37Wd5CwoA/Qw5eO8wDe/rSrD3pPvN6zkb8pZiPTrdGYb7lDRFgHwBFif5Oay3YEqH6bAjLAwIp4GwCJ5HDX8w8BQn0UWrJBhnHVCX8zaRsvXfBa57ScVtwAs6mRMQ2JrncZ+ElwERcJgFJrYHTp1PY4rv2CcCehnyVby/l4yjRzV0496C4ARROkUtFnkDJ/W1AO/0pFEPV/gyZO5kf11Ronpki4KonuSRHJJNd/S8B3JtLl78Z/WkefSSy1HcU9Zv56M2gw0/sjPbD1MNB4i7O76it5zKLM7S6zg0Ya8D7QnMkH76BzP8WO4v8dd4eElk1lws3ecTgi7e2grinXDIOIZqdODuFi6afsmn/cy1o0TaiFwv1adMSx6ox/t/Jr40LMnxTVaICRRpeG/09hJLBOcngF9HYeh/25XbW1oFLofBMR1Q7YnDA==|920
+}//1gjL0f5n9/FUPRNXPZWOIbaVcpyvAXsovBwCrvfimp2OxaCWJT4B/3ki+c35gHukbzsqbNaQFQ5yOodQflg0tUGlINk20YHcKy25byVWT0iavxGzvta5Bllhn44BoROyZ51OYjDwvudtDIcoCZLBEhJAMqDiYxussWVBrk4/3ZumX7WqPqzXwedsz34yyY8o/zpP3cqpoCABJtEjjJYAzBjowruJ9OUODOUXtWdL40hygkxsmyxqGxPJdgE9xCG1hNuHh5pETtnzGZ9Oap2z5kdtHXuSC2I+/TnnCWaRwtgyGJ863rKg1deWkdXNb1LQWrt4IecKgiGohI7LvO8j98juJeVyurrwSTjMXmuwMRltLm7aGwaKgVRT3Mb/hgysObozroAG25HGzaa5J08h1/vvhrh9xcIBTpMFBUiDMqBu6Tmw98m+z9qK1GNXzu0XxqCex16Gh//SQPJo5nOqaWwu9Zvh02YaZUICyhNveSJeqPAfbO8VpqcWXZ87rx7ojLLlssa3aopVX80cidcowpwr8KQ9RdLai4hc9EUdNtffgIj2JyHYPXnCa4E+iy10+B6Y2XBXWBhTOjuxFcy9nXSKsI8fWXp2Gx8X1yDBZB1hjBSlNC5xvCMLbo4hOd9o9jsbjPWO7uwQ1xT6Yrzw/xy0uQNIcg1JaXmRwEW0oB/z0d8crzjwIN4depxhrgDzIuc2XuamivUMa9bvE5byxe7MjlB4EUzxncX1FwjrPKUAEO6r4MNuFIPVmXuR5Te6Bu0FALU4/MZuEpz8ophHUi5ipJdl31S2bhGm288sJJPWwh5wk+ssWfyyfPB4/drJgIOLaz+y8hnkZGhbAj6yQ/013ry1puXK1FgRu8zo8TqDZpnxU34aWg5HkHMj+wK/YtcvLOP9X5pkGvXrJkUTUw==|920
--- a/Pages/任务/任务-基本信息.rd
+++ b/Pages/任务/任务-基本信息.rd
@@ -3,10 +3,25 @@
  "ColumnCount": 21,
  "RowCount": 14,
  "Formulas": {
-    "7,19": "L12-任务总计划工时",
    "7,2": "项目ID"
  },
  "CustomNames": [
+    {
+      "Name": "父任务ID",
+      "Formula": "'任务-基本信息'!$L$8"
+    },
+    {
+      "Name": "结束日期",
+      "Formula": "'任务-基本信息'!$L$10"
+    },
+    {
+      "Name": "开始日期",
+      "Formula": "'任务-基本信息'!$C$10"
+    },
+    {
+      "Name": "里程碑",
+      "Formula": "'任务-基本信息'!$L$4"
+    },
    {
      "Name": "任务分组",
      "Formula": "'任务-基本信息'!$L$6"
@@ -15,33 +30,17 @@
      "Name": "任务类型",
      "Formula": "'任务-基本信息'!$C$6"
    },
-    {
-      "Name": "执行者",
-      "Formula": "'任务-基本信息'!$C$12"
-    },
    {
      "Name": "任务名称",
      "Formula": "'任务-基本信息'!$B$2"
    },
-    {
-      "Name": "父任务ID",
-      "Formula": "'任务-基本信息'!$L$8"
-    },
-    {
-      "Name": "里程碑",
-      "Formula": "'任务-基本信息'!$L$4"
-    },
    {
      "Name": "预算工时",
      "Formula": "'任务-基本信息'!$L$12"
    },
    {
-      "Name": "开始日期",
-      "Formula": "'任务-基本信息'!$C$10"
-    },
-    {
-      "Name": "结束日期",
-      "Formula": "'任务-基本信息'!$L$10"
+      "Name": "执行者",
+      "Formula": "'任务-基本信息'!$C$12"
    }
  ]
 }
--- a/Pages/任务/任务-工时.json
+++ b/Pages/任务/任务-工时.json
@@ -231,6 +231,23 @@
        "IconSize": 14.0
      }
    },
+    "1,19": {
+      "BindingInfo": {
+        "TableName": "任务平行视图",
+        "ColumnName": "项目ID",
+        "GUID": "28c08d4f-28a6-44b3-99c3-bf3af881287d",
+        "RelationBinding": {
+          "RelatedTable": "项目平行视图",
+          "RelatedColumn": "ID",
+          "DisplayColumn": "工时分配方式",
+          "NextRelationBinding": {
+            "RelatedTable": "工时分配方式",
+            "RelatedColumn": "ID",
+            "DisplayColumn": "分配方式"
+          }
+        }
+      }
+    },
    "1,20": {
      "CellType": {
        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
@@ -285,8 +302,8 @@
    "4,4": {
      "BindingInfo": {
        "TableName": "任务平行视图",
-        "ColumnName": "成员计划工时",
-        "GUID": "d4228306-b932-4d00-aa87-be3efef5e2f3"
+        "ColumnName": "已分配工时",
+        "GUID": "3a1a5570-daf8-4c9f-a8cc-61ba96c060c0"
      },
      "CellType": {
        "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
@@ -315,7 +332,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "25807078-9764-4a29-a397-8daf7f416afa"
+                "ID": "50c7327b-0464-4d82-9ce4-ff01a67d5725"
              },
              {
                "CommandList": [
@@ -354,12 +371,12 @@
                            "LoadBindingDataOption": 1
                          }
                        ],
-                        "ID": "99cdfabe-fcaa-471d-8349-ab3bd6355d50"
+                        "ID": "d8845c4b-f31a-4615-b98b-15c24f2b1fb9"
                      }
                    ]
                  }
                ],
-                "ID": "c3a1de6c-5b2d-4f11-a4ab-062a1cab69b9"
+                "ID": "700ddad3-3ccb-4251-b4a9-5373c7641cf7"
              }
            ]
          }
@@ -396,7 +413,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "8a9f7ec2-778b-49dd-afea-ea7e3dbdf4d9"
+                "ID": "4d885980-2a1f-4c99-852d-761c252f4df3"
              },
              {
                "CommandList": [
@@ -435,12 +452,12 @@
                            "LoadBindingDataOption": 1
                          }
                        ],
-                        "ID": "69da5f72-acdd-4ce5-a9c9-a30d7f5e1985"
+                        "ID": "5145d874-a36a-46c6-b8c1-e0ab2e5254d7"
                      }
                    ]
                  }
                ],
-                "ID": "2e1a0437-2ea7-4746-b002-88961812ecb4"
+                "ID": "dffc353b-942c-459d-9312-a3f0c1664bce"
              }
            ]
          }
@@ -463,8 +480,8 @@
    "8,4": {
      "BindingInfo": {
        "TableName": "任务平行视图",
-        "ColumnName": "成员实际工时",
-        "GUID": "2516549e-9623-4b43-ac23-4c485c9b5033"
+        "ColumnName": "实际工时",
+        "GUID": "67129f34-c488-4414-98be-114feed2eab1"
      },
      "CellType": {
        "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
@@ -493,7 +510,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "d90acc68-4f9a-49ef-bf92-a0157cb77a46"
+                "ID": "00fe2d7a-9994-481f-8a26-0044b697cb3c"
              },
              {
                "CommandList": [
@@ -532,12 +549,12 @@
                            "LoadBindingDataOption": 1
                          }
                        ],
-                        "ID": "5f786957-ecca-4d41-a707-cc70e8aa020a"
+                        "ID": "dd9c7775-5ae3-4969-9414-da9230d74704"
                      }
                    ]
                  }
                ],
-                "ID": "3bf6a1b3-6d32-4f95-bee0-786fb27c23ed"
+                "ID": "be6260b8-309a-4e63-8e46-8ca5a264f36d"
              }
            ]
          }
@@ -599,7 +616,7 @@
                            "LoadBindingDataOption": 1
                          }
                        ],
-                        "ID": "3ad0bb3a-2938-4679-b9bb-2f553663831c"
+                        "ID": "79962f11-e192-45b4-a503-9b41897d7ba9"
                      },
                      {
                        "CommandList": [
@@ -638,17 +655,17 @@
                                    "LoadBindingDataOption": 1
                                  }
                                ],
-                                "ID": "0194f2c9-13db-473b-94dc-75cb53850936"
+                                "ID": "4b7c0cce-b0c1-4fd3-8bd3-49b160e7197e"
                              }
                            ]
                          }
                        ],
-                        "ID": "36d9e3d0-afe7-437e-b31b-b9aecf36ae90"
+                        "ID": "25737cab-e750-40b8-8094-6cf043daccdf"
                      }
                    ]
                  }
                ],
-                "ID": "471eebf6-e80f-42f6-af56-83d594e38ab8"
+                "ID": "fd58ba28-f292-47dd-bd12-66b628e266db"
              },
              {
                "CommandList": [
@@ -658,7 +675,7 @@
                    "Message": "当前任务状态，允许上报工时"
                  }
                ],
-                "ID": "d62f5514-da97-4cbb-8c18-d0426d99b6a8"
+                "ID": "4bf7a7d2-1d66-4018-b012-23c8f3f54d2d"
              }
            ]
          }
@@ -889,7 +906,7 @@
                    ]
                  }
                ],
-                "ID": "a6feb4f1-824c-4742-8f06-8e62ff23f993"
+                "ID": "8abe279d-0fef-4644-85df-427d6cf0653b"
              },
              {
                "CommandList": [
@@ -909,7 +926,7 @@
                    ]
                  }
                ],
-                "ID": "e9fd5373-7032-4c81-bf32-901caa524ab4"
+                "ID": "49195b9e-0ca2-4ee5-a464-20847630d090"
              }
            ]
          }
@@ -926,10 +943,16 @@
        "Formatter": 2,
        "HorizontalAlignment": 3
      },
+      {
+        "FontSize": 12.0,
+        "Foreground": 4,
+        "TextIndent": 5,
+        "HorizontalAlignment": 5
+      },
      {
        "FontFamily": 0,
        "FontSize": 13.333333333333332,
-        "Foreground": 4
+        "Foreground": 6
      },
      {
        "FontFamily": 0,
@@ -938,35 +961,35 @@
      {
        "FontFamily": 0,
        "FontSize": 13.333333333333332,
-        "Foreground": 5,
+        "Foreground": 7,
        "Formatter": 2,
-        "HorizontalAlignment": 6
+        "HorizontalAlignment": 8
      },
      {
        "FontFamily": 0,
        "FontSize": 13.333333333333332,
-        "Foreground": 7,
-        "HorizontalAlignment": 6
+        "Foreground": 4,
+        "HorizontalAlignment": 8
      },
      {
-        "Formatter": 8,
+        "Formatter": 9,
+        "TextIndent": 5,
+        "HorizontalAlignment": 3,
+        "Underline": false
+      },
+      {
+        "Foreground": 6
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "Formatter": 9,
        "TextIndent": 5,
        "HorizontalAlignment": 3,
        "Underline": false
      },
      {
        "Foreground": 4
-      },
-      {
-        "FontFamily": 0,
-        "FontSize": 13.333333333333332,
-        "Formatter": 8,
-        "TextIndent": 5,
-        "HorizontalAlignment": 3,
-        "Underline": false
-      },
-      {
-        "Foreground": 7
      }
    ],
    "Types": {
@@ -975,19 +998,21 @@
        "black",
        "[AUTO]General",
        "Left",
+        "Text 1 50",
+        "Right",
        "Accent 1 0",
        "Background 1 -25",
        "Center",
-        "Text 1 50",
        "General\"小时\""
      ]
    },
    "CellStyles": {
      "1,1": 0,
-      "1,20": 1,
-      "1,21": 2,
-      "1,22": 2,
-      "1,23": 3,
+      "1,19": 1,
+      "1,20": 2,
+      "1,21": 3,
+      "1,22": 3,
+      "1,23": 4,
      "2,1": 0,
      "2,2": 0,
      "2,3": 0,
@@ -1009,107 +1034,107 @@
      "2,19": 0,
      "2,20": 0,
      "2,21": 0,
-      "2,23": 3,
-      "4,2": 4,
-      "4,4": 5,
-      "4,20": 6,
-      "5,2": 4,
-      "5,3": 4,
-      "5,4": 5,
-      "5,5": 5,
-      "5,6": 5,
-      "5,7": 5,
-      "5,8": 5,
-      "5,9": 5,
-      "5,10": 5,
-      "5,11": 5,
-      "5,12": 5,
-      "5,13": 5,
-      "5,14": 5,
-      "5,15": 5,
-      "5,16": 5,
-      "5,17": 5,
-      "5,18": 5,
-      "8,2": 4,
-      "8,4": 7,
-      "8,19": 2,
-      "8,20": 1,
-      "8,21": 2,
-      "8,22": 2,
-      "8,23": 2,
-      "9,2": 4,
-      "9,23": 2,
-      "10,2": 4,
-      "10,23": 2,
-      "11,2": 4,
-      "11,3": 4,
-      "11,4": 7,
-      "11,5": 7,
-      "11,6": 7,
-      "11,7": 7,
-      "11,8": 7,
-      "11,9": 7,
-      "11,10": 7,
-      "11,11": 7,
-      "11,12": 7,
-      "11,13": 7,
-      "11,14": 7,
-      "11,15": 7,
-      "11,16": 7,
-      "11,17": 7,
-      "11,18": 7,
-      "11,19": 2,
-      "11,20": 1,
-      "11,21": 1,
-      "11,22": 1,
-      "11,23": 2,
-      "12,2": 4,
-      "12,3": 4,
-      "12,4": 7,
-      "12,5": 7,
-      "12,6": 7,
-      "12,7": 7,
-      "12,8": 7,
-      "12,9": 7,
-      "12,10": 7,
-      "12,11": 7,
-      "12,12": 7,
-      "12,13": 7,
-      "12,14": 7,
-      "12,15": 7,
-      "12,16": 7,
-      "12,17": 7,
-      "12,18": 7,
-      "12,19": 2,
-      "12,20": 1,
-      "12,21": 1,
-      "12,22": 1,
-      "12,23": 2,
-      "13,2": 4,
-      "13,3": 4,
-      "13,4": 7,
-      "13,5": 7,
-      "13,6": 7,
-      "13,7": 7,
-      "13,8": 7,
-      "13,9": 7,
-      "13,10": 7,
-      "13,11": 7,
-      "13,12": 7,
-      "13,13": 7,
-      "13,14": 7,
-      "13,15": 7,
-      "13,16": 7,
-      "13,17": 7,
-      "13,18": 7,
-      "13,19": 2,
-      "13,20": 1,
-      "13,21": 1
+      "2,23": 4,
+      "4,2": 5,
+      "4,4": 6,
+      "4,20": 7,
+      "5,2": 5,
+      "5,3": 5,
+      "5,4": 6,
+      "5,5": 6,
+      "5,6": 6,
+      "5,7": 6,
+      "5,8": 6,
+      "5,9": 6,
+      "5,10": 6,
+      "5,11": 6,
+      "5,12": 6,
+      "5,13": 6,
+      "5,14": 6,
+      "5,15": 6,
+      "5,16": 6,
+      "5,17": 6,
+      "5,18": 6,
+      "8,2": 5,
+      "8,4": 8,
+      "8,19": 3,
+      "8,20": 2,
+      "8,21": 3,
+      "8,22": 3,
+      "8,23": 3,
+      "9,2": 5,
+      "9,23": 3,
+      "10,2": 5,
+      "10,23": 3,
+      "11,2": 5,
+      "11,3": 5,
+      "11,4": 8,
+      "11,5": 8,
+      "11,6": 8,
+      "11,7": 8,
+      "11,8": 8,
+      "11,9": 8,
+      "11,10": 8,
+      "11,11": 8,
+      "11,12": 8,
+      "11,13": 8,
+      "11,14": 8,
+      "11,15": 8,
+      "11,16": 8,
+      "11,17": 8,
+      "11,18": 8,
+      "11,19": 3,
+      "11,20": 2,
+      "11,21": 2,
+      "11,22": 2,
+      "11,23": 3,
+      "12,2": 5,
+      "12,3": 5,
+      "12,4": 8,
+      "12,5": 8,
+      "12,6": 8,
+      "12,7": 8,
+      "12,8": 8,
+      "12,9": 8,
+      "12,10": 8,
+      "12,11": 8,
+      "12,12": 8,
+      "12,13": 8,
+      "12,14": 8,
+      "12,15": 8,
+      "12,16": 8,
+      "12,17": 8,
+      "12,18": 8,
+      "12,19": 3,
+      "12,20": 2,
+      "12,21": 2,
+      "12,22": 2,
+      "12,23": 3,
+      "13,2": 5,
+      "13,3": 5,
+      "13,4": 8,
+      "13,5": 8,
+      "13,6": 8,
+      "13,7": 8,
+      "13,8": 8,
+      "13,9": 8,
+      "13,10": 8,
+      "13,11": 8,
+      "13,12": 8,
+      "13,13": 8,
+      "13,14": 8,
+      "13,15": 8,
+      "13,16": 8,
+      "13,17": 8,
+      "13,18": 8,
+      "13,19": 3,
+      "13,20": 2,
+      "13,21": 2
    },
    "ColStyles": {
-      "1": 8,
-      "2": 8,
-      "3": 8
+      "1": 9,
+      "2": 9,
+      "3": 9
    },
    "SheetStyle": {
      "FontFamily": 0,
@@ -1126,8 +1151,8 @@
    "13,21,1,3",
    "1,1,1,6",
    "1,20,1,3",
-    "4,4,1,15",
-    "8,4,1,15"
+    "4,4,1,6",
+    "8,4,1,6"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1236,4 +1261,4 @@
      "Formula": "'任务-工时'!$V$14"
    }
  ]
-}//hBWWp2rk63DwahYqrXde0p3GdddIcWiOm5SsKUCZD2PMH+uV8ZzqosGZPtwjYYLturXY1D84O1SGoITfFgeW4yj1Tx/BpomUpTmQEEZZ2Sohioc/NyY/wSk+1DYjeSjMl4kOVV83jHe7/4WZgy41UrgolsSLdCrFI2TUbuc/oFZA5LiwDL2Rsmd9sLaekp3ExdTlBsdu6UmbAYEuBsXn1GQo89yc2lpz6iJIa0rMQWy76f38y6MpRWAhPbU1t46C0Z70n3nV5JJyOz1YSEFtKnfu3Rgfd/pcLTdkPSZQfnyhwY/91N+3w3KMexJ1SgjdHEQUJr10g0Y8p+vWZbUKQg3xJITCZTFp/mcnzFlte37kxEIBR6RL+TXZSrJQfbjHU34Ebz+qYWDOjwyC4df0Mkr22pVwpo58CdEy7hbXUncbQf19JilJvKvsKrMaSOqUDrfLHw9stCR7uDEjOweAB6ZD0TTKH9doC4zjCjr30FkebqkyKly11hUPwr18RO0SU+RkfttzTO9tAVZqn/fJOHAdByS4E3aghlowYEV/0vEtENse4LALpdNvpFOWw/QvTdafZjE53FUaOW/4T7dVqkC2u2jtkF/xhv7Iu2agpjbOvxaYWzey5F5oKS3vG/6pKajq54tv98Du0+lIJOKL0fEY0bAsa6AJ9tOSiVltsrI9dUYs5joAg9O+IeOAjDO3+phn4WDpkZtkkaQ6dNn5tD6MMIHNk+DM9sZLkEsurCXc481bil08b9so7sogKahuq9CyMxd8qQhhwGSyO/ogkaMZ/RiXOdXvoSwcfUIscYsNqVprGnA83Uh9lBhdHCHr0lYSpkPWFPCQz8ikUkaiKvwIE3sYoYrpK29Yzyk83bqkqp3qoW5UCS7xWMDProHAMMhb43VqUXwWO8bE0VAiQQ==|920
+}//xk9ySCug56ExEvsyztC0vNfUVwcNfYyxRS8mNn1EHnYqjqXF/xJkFjyHkK+3NbNzPVy454cLtXEs1rzEEyBeB7WdRhBtDVwdgxKoAf7xEuZkImDL7Vk9sp6sjGH4ptfGoYSbTO6wTCPT80OO71ygLmW96MZfIK5bROc1DHJWozL0ZXW29+KSog1qglvnhn7bGm+BE7jLqEGR1xnLFjjNmiRGJ64kiUZpTv1687Dmg2h43KNqzCAuQtAAbcirZh8uCF1KGu76rrlpgv7yU2A8yQIBSV3lKSRSp6omOmtsXfG00ey1n7Put4lYup9VcQEWy9Bgf4t0yJqOkYh0cd43+OQW8XaE0qcbpRpWt6qLuhy4nDqkmdJYunbM3oHNQiZmlbhNgkCRW4SuCCCp/P4K2ouRHCQs/iwLqEuwwgEJ8cgDkYRutrlDGPJnM9LnRJ5ryA1gvt/Oif0phTuIDf+xSmYzdSPthmHb57LFImK29m+FhKYQ0lDS061T5mvRqlXC2za4m0O3BPTTiPWyW3njMBXk/KXV6m5R3BZB0qOZsxLrvi0X3yakKauvVrvm9j09cl5+5JJe/joRLz2GuOHqJPMr6QuO9S/ml+eu+qlO17h9CBGjmiCw8TaDiCjAYn/rFtQPZxrQ88yzVKh5N8788ZpWsCqcw3OCJkMRje7JIqJg/o+M/bn6ewdX8sBDOY5e1FHjhycv0jY4tOousfbcWn3m1pFnW4zSdotlGd9pWJYNzHwljroes1hz2JuaLYk8tIObRNy29Y81Vqn0V3OQXRzxJg3knbNyyoG1gu3fE9+va/XZZC6t6Et7VI5G/g+vQAFW19n/mkspOfOibDq4Wl8sgFW9yXwk6ie2WEa6w/mhT8zrwgu6AtPeX+csaWNIKdquSG5kdl4+ayK76YSH6g==|920
--- a/Pages/任务/任务首页.json
+++ b/Pages/任务/任务首页.json
@@ -40,12 +40,14 @@
      },
      "6": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 32.0,
+          "IsHidden": true
        }
      },
      "7": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 32.0,
+          "IsHidden": true
        }
      }
    },
@@ -368,12 +370,12 @@
                            "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
                          }
                        ],
-                        "ID": "4edfaf5c-34b7-4a8d-872f-36aa75dc4553"
+                        "ID": "b22d1bf3-bd8e-4dfc-9e93-dc77b36810ef"
                      }
                    ]
                  }
                ],
-                "ID": "afe687ae-b39d-4088-b2bf-35ebdfdf2903"
+                "ID": "b0822129-df64-4bff-9723-f4a22d533b4d"
              }
            ]
          }
@@ -589,7 +591,7 @@
                                "MethodName": "Refresh"
                              }
                            ],
-                            "ID": "1507f371-0b45-4e6a-8528-32867df9f24a"
+                            "ID": "dee0c3b8-b862-4035-be07-fbba6e16dbce"
                          },
                          {
                            "CommandList": [
@@ -604,12 +606,12 @@
                                "BtnText": "知道了"
                              }
                            ],
-                            "ID": "29443263-2e5a-4aa4-a75a-fa8b67058268"
+                            "ID": "21a99d81-2140-44dd-808a-373978eb0198"
                          }
                        ]
                      }
                    ],
-                    "ID": "ec974da0-5264-499a-b207-9e5d3f1b57e9"
+                    "ID": "6d7b01aa-d6cb-407f-874e-ea4f05aa8493"
                  }
                ]
              }
@@ -703,7 +705,7 @@
                            "ReloadData": true
                          }
                        ],
-                        "ID": "2feb95d8-7a69-4374-94d5-75214f7e3076"
+                        "ID": "30ee5acc-cecc-4122-a5d6-3da83f8255f0"
                      },
                      {
                        "CommandList": [
@@ -718,7 +720,7 @@
                            "BtnText": "知道了"
                          }
                        ],
-                        "ID": "84b72195-d1ba-4e64-b851-8120646a4ccc"
+                        "ID": "0401df86-c667-4441-829f-3d93eddb672e"
                      }
                    ]
                  }
@@ -858,7 +860,7 @@
                            }
                          }
                        ],
-                        "ID": "319df5eb-86e3-4a1d-a5c6-72d58bb5b941"
+                        "ID": "d4e5cda8-1a06-4231-9d7c-046adcb772e6"
                      }
                    ]
                  },
@@ -899,12 +901,12 @@
                            }
                          }
                        ],
-                        "ID": "d3b2f41a-ec75-4734-b0f9-3ee653604670"
+                        "ID": "4b71c551-bbe9-495a-8011-15f480b7108d"
                      }
                    ]
                  }
                ],
-                "ID": "b50341b3-0015-4493-91e9-a40f41ea353c"
+                "ID": "31bb9c8a-f48c-442e-89a5-7493a2f4cab4"
              }
            ]
          }
@@ -965,7 +967,7 @@
                    }
                  }
                ],
-                "ID": "194682dc-5338-4cdd-9e91-49b2ed0fdd76"
+                "ID": "bfe01c3c-fafc-40a0-af97-c2797f62bdd9"
              }
            ]
          },
@@ -1006,7 +1008,7 @@
                    }
                  }
                ],
-                "ID": "88fb1f22-3aaf-49f2-a01f-3b9f6b1b5c29"
+                "ID": "84a6eb88-5ce2-485e-9da4-d3403d37783a"
              }
            ]
          }
@@ -1098,8 +1100,8 @@
    "7,10": {
      "BindingInfo": {
        "TableName": "任务平行视图",
-        "ColumnName": "成员计划工时",
-        "GUID": "c0d94269-8d7e-425a-bdbf-3b3efdd787d4"
+        "ColumnName": "已分配工时",
+        "GUID": "9f4afb6b-ff78-4067-9c8e-244690e27646"
      }
    },
    "7,17": {
@@ -1136,6 +1138,35 @@
            "JavaScript": "Forguncy.Page.recalc();\r\nForguncy.Page.reloadBindingData();\r\n",
            "ID": "8e45cfc63efd4a619b60ffad6e35ec0e"
          },
+          {
+            "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+            "CurrentRowInfo": {
+              "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+              "SubConditions": [
+                {
+                  "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                  "ColumnBindingInfo": {
+                    "TableName": "ACT_RU_TASK_View",
+                    "ColumnName": "PROC_INST_ID_",
+                    "GUID": "7fc12bff-cffb-4af6-8b0c-b8ee0fda95e8"
+                  },
+                  "Value": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=任务首页!流程实例ID"
+                  }
+                },
+                {
+                  "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                  "ColumnBindingInfo": {
+                    "TableName": "ACT_RU_TASK_View",
+                    "ColumnName": "ASSIGNEE_",
+                    "GUID": "f71c3b95-acf7-4dcf-9261-5e9baacd1c72"
+                  },
+                  "Value": "%CurrentUser.UserName%"
+                }
+              ]
+            }
+          },
          {
            "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
            "TargetPageElement": {
@@ -1438,6 +1469,24 @@
        "BorderLeft": 1,
        "BorderRight": 1
      },
+      {
+        "FontFamily": 1,
+        "FontSize": 13.333333333333332,
+        "Foreground": 6,
+        "HorizontalAlignment": 8,
+        "BorderBottom": 1,
+        "BorderTop": 1,
+        "BorderLeft": 1
+      },
+      {
+        "BorderBottom": 1,
+        "BorderTop": 1
+      },
+      {
+        "BorderBottom": 1,
+        "BorderTop": 1,
+        "BorderRight": 1
+      },
      {
        "FontSize": 13.333333333333332,
        "Foreground": 6,
@@ -1639,10 +1688,10 @@
      "7,7": 13,
      "7,8": 17,
      "7,9": 17,
-      "7,10": 21,
-      "7,11": 14,
-      "7,12": 14,
-      "7,13": 14,
+      "7,10": 22,
+      "7,11": 23,
+      "7,12": 23,
+      "7,13": 24,
      "7,14": 16,
      "7,15": 17,
      "7,16": 17,
@@ -1662,7 +1711,7 @@
      "8,1": 13,
      "8,2": 17,
      "8,3": 17,
-      "8,4": 22,
+      "8,4": 25,
      "8,5": 14,
      "8,6": 14,
      "8,7": 16,
@@ -1688,7 +1737,7 @@
      "8,27": 14,
      "8,28": 14,
      "8,29": 19,
-      "9,1": 23,
+      "9,1": 26,
      "9,2": 17,
      "9,3": 17,
      "9,4": 21,
@@ -1699,19 +1748,19 @@
      "9,9": 17,
      "9,10": 21,
      "9,11": 21,
-      "9,12": 24,
-      "9,13": 24,
+      "9,12": 27,
+      "9,13": 27,
      "9,14": 13,
      "9,15": 17,
      "9,16": 17,
-      "9,17": 25,
+      "9,17": 28,
      "9,18": 14,
      "9,19": 14,
      "9,20": 14,
-      "9,21": 25,
+      "9,21": 28,
      "9,22": 14,
      "9,23": 14,
-      "9,24": 26,
+      "9,24": 29,
      "9,25": 14,
      "9,26": 14,
      "9,27": 14,
@@ -1719,7 +1768,7 @@
      "9,29": 19
    },
    "RowStyles": {
-      "4": 27
+      "4": 30
    },
    "SheetStyle": {
      "FontFamily": 1
@@ -1744,7 +1793,6 @@
    "9,4,1,3",
    "9,7,1,3",
    "6,10,1,4",
-    "7,10,1,4",
    "8,10,1,4",
    "8,14,1,3",
    "8,17,1,4",
@@ -1761,7 +1809,8 @@
    "7,14,1,3",
    "7,17,1,4",
    "9,14,1,3",
-    "9,17,1,4"
+    "9,17,1,4",
+    "7,10,1,4"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1808,7 +1857,19 @@
      "Formula": "任务首页!$E$8"
    },
    {
-      "Name": "任务总计划工时",
+      "Name": "流程实例ID",
+      "Formula": "任务首页!$R$7"
+    },
+    {
+      "Name": "任务信息容器",
+      "Formula": "任务首页!$A$5"
+    },
+    {
+      "Name": "任务状态码",
+      "Formula": "任务首页!$R$9"
+    },
+    {
+      "Name": "任务已分配工时",
      "Formula": "任务首页!$K$8"
    },
    {
@@ -1823,10 +1884,18 @@
      "Name": "收起侧栏",
      "Formula": "任务首页!$E$10"
    },
+    {
+      "Name": "刷新任务",
+      "Formula": "任务首页!$B$10"
+    },
    {
      "Name": "下箭头",
      "Formula": "任务首页!$M$10"
    },
+    {
+      "Name": "项目名称",
+      "Formula": "任务首页!$E$9"
+    },
    {
      "Name": "项目ID",
      "Formula": "任务首页!$K$7"
@@ -1834,26 +1903,6 @@
    {
      "Name": "折叠全部",
      "Formula": "任务首页!$H$10"
-    },
-    {
-      "Name": "刷新任务",
-      "Formula": "任务首页!$B$10"
-    },
-    {
-      "Name": "流程实例ID",
-      "Formula": "任务首页!$R$7"
-    },
-    {
-      "Name": "项目名称",
-      "Formula": "任务首页!$E$9"
-    },
-    {
-      "Name": "任务状态码",
-      "Formula": "任务首页!$R$9"
-    },
-    {
-      "Name": "任务信息容器",
-      "Formula": "任务首页!$A$5"
    }
  ]
-}//4e3D4dQdQhk/dvgdSFftgDcyf2Qk9dF7EYpnDR/YE6mQhG/fnia/IDPYX8JHkpBdSQq97cgcY3YNeDK3rVg/4oIqyTF1EEVfDLto29flw83T1JymWSOXZrTsteUXcUG9SiqzAMjXV9jqpKYbOPMikgJQMAoUv8I/OdjxcuvYwt5IVgtkCsh6XZP5UkQkcPJJs4DOxmVisT7waaxVQltID6ye0DbzlXA4HO/AGcaSszwQK9g7fpNoaAsTq/1nR78IWog4XQZIjtA+aIyQoJQtCsR5tPEHt1Of0cu4XJDetQRWRKZk5LYiLhfVKqZm/YzBpsi63HxAROciMoa5zBCaon5TQAdFnmbNqY0LEH6g1AHJaBasgetQsocCTY+g/6q4d8tLkyeTmJx0ogJgIqzesN7P0LSHxhn3Ew9GyeGH5k48OE7RYKd3pYSC86bVlG1+nQssYel4nbWoIalJIJUjUPCbkY08dIxK2zMwKSmPC4daf1VBU21Nx+fSpsUYvAuzn8nxwfks8yNpDU9ctnK2bq7S48inF8WDzL2tiM+RJTRHml7eMufXq2ZOLmbDLNCS+PBNu50t8t5sSnyQRRCNsNX4XQ0a0V88Jol4oZ6gQzy2Y0xg79P9T50b36/gzNIYpdrMIAJS4IBYGntRHlRADTi3412EWD+/jPdDbAXKNj94T3XAp+hvs9fA0C4x+wFB89MzFVbYoH2N5FR2cH2fCmNOfmu4NroAnk+qPlslC4/IHlMsMCN+uWuqL55EoCg2hGK50wR8uTF1iaiSgfuUYA0JPWeTBlPViF8G2H4oStN+ea+63q7Ej8UdUAxgRoViuARJyj//bdJ//iUNftrTievK19jWbG1yafdplIFiP86r78fc3I5eJyLMuxOoomUDYEVZPWNP+vIm7VL4mWVsxg==|920
+}//eLB4YCUlDB5n6rOboBEhJzKUH8T7+gJxvF65pnCkpJu77oHpRdKUoAIvHvPtazYsJ9b85aFZziKsBdC8kUH29Uurx2MhOdFU7BykuSY95mDG91wc96Drb7f8mgMTRdLUCG89W9SLrTJFAHSX5h5T+W8Dsjexwfs0Tk5rA4YcJ4GKuBg62/5tVH1d5/vocPXtXP2uCi709mO/HX40xYfqJWM2TnPC4BAeccLb0El1b7fKFHmLB8nfEpodUu1rU/6BO4cnwbu0T/8ofH2wLYdQkegnzFIeKPdXE7oyaCJPLgC6904QR1QdZZ+0SdMtqsWO3RNEc/2FYZg/yYsdpYtuvRpaBHk/3I6EU0E1vas85pMtNjA2/Q8KOtMQuu8rwWfGyXsaByyiucNEsiQ0P64xGqgG1HkVw3BfDh4tNF4k05jiUaDjqfB/3B3wjY/nCyotUjDxIKQz4rHfdYK+Uy31B6x7HtWOmbeNtgSWGbA0WMOGPzBGpsA6QIz5X/Rmi7zElVpqoTYMbXALBJ0BjzDQCareDMARB1yRYl/PqzKw3P9Qykek6Eu9JSxc6gwZ/lZ9UHCnj0deBph3b6E/LlSb1Wv5x/qct7O8sukWgNUmdi8RQvCLv4UOo4uqWc69o1hf73qVXrd7lmR7ZwexdT1wSgmiwHCG+Yd9Rd2fU0E8Iw4Z4OAEW6aiHbF+xqMI4J2nG55LuU7C9Lz36qGJAoPWCUnm5c4FayFvQS3gjscQ5WfItIpC7n4LqHLdkFiotW+WPYF58ftNowGBnxJM5MNlJZiTP2KSZ/L5GJK9OhPEb0KOcfMcAw14Bus+B8NITlNklx5Pcr90uoKPDpVFrre8RasAoHfIbTGm45lYZS5kFt4rpswhMmJBJ/i/x7z7YrMoThDbcRRVXjjpKp7KyIA4Hw==|920
--- a/Pages/任务/任务首页.rd
+++ b/Pages/任务/任务首页.rd
@@ -16,7 +16,19 @@
      "Formula": "任务首页!$E$8"
    },
    {
-      "Name": "任务总计划工时",
+      "Name": "流程实例ID",
+      "Formula": "任务首页!$R$7"
+    },
+    {
+      "Name": "任务信息容器",
+      "Formula": "任务首页!$A$5"
+    },
+    {
+      "Name": "任务状态码",
+      "Formula": "任务首页!$R$9"
+    },
+    {
+      "Name": "任务已分配工时",
      "Formula": "任务首页!$K$8"
    },
    {
@@ -31,10 +43,18 @@
      "Name": "收起侧栏",
      "Formula": "任务首页!$E$10"
    },
+    {
+      "Name": "刷新任务",
+      "Formula": "任务首页!$B$10"
+    },
    {
      "Name": "下箭头",
      "Formula": "任务首页!$M$10"
    },
+    {
+      "Name": "项目名称",
+      "Formula": "任务首页!$E$9"
+    },
    {
      "Name": "项目ID",
      "Formula": "任务首页!$K$7"
@@ -42,26 +62,6 @@
    {
      "Name": "折叠全部",
      "Formula": "任务首页!$H$10"
-    },
-    {
-      "Name": "刷新任务",
-      "Formula": "任务首页!$B$10"
-    },
-    {
-      "Name": "流程实例ID",
-      "Formula": "任务首页!$R$7"
-    },
-    {
-      "Name": "项目名称",
-      "Formula": "任务首页!$E$9"
-    },
-    {
-      "Name": "任务状态码",
-      "Formula": "任务首页!$R$9"
-    },
-    {
-      "Name": "任务信息容器",
-      "Formula": "任务首页!$A$5"
    }
  ]
 }
--- a/Pages/任务/工时/新增报工.json
+++ b/Pages/任务/工时/新增报工.json
@@ -327,7 +327,7 @@
          "TableName": "任务表",
          "BindingInfos": [
            {
-              "GUID": "bfcd8f5f-fc99-4c8f-9b81-57774c4c2b2c",
+              "GUID": "0d12b43d-6d98-4e6d-af5a-dcc86fe91b6e",
              "BindingInfo": {
                "TableName": "任务表",
                "ColumnName": "ID",
@@ -336,7 +336,7 @@
              "ColumnName": "value"
            },
            {
-              "GUID": "8c54b2a7-fef9-428e-b043-16525a4b9a15",
+              "GUID": "bb7a15e2-b562-47d4-8a08-80db1654ae9c",
              "BindingInfo": {
                "TableName": "任务表",
                "ColumnName": "任务名称",
@@ -346,16 +346,30 @@
            }
          ],
          "SqlCondition": {
-            "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-            "ColumnBindingInfo": {
-              "TableName": "任务表",
-              "ColumnName": "项目ID",
-              "GUID": "25809070-f2d3-4c8a-aa77-b00ec7760e83"
-            },
-            "Value": {
-              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-              "SerializeProperty": "=新增报工!项目ID"
-            }
+            "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+            "SubConditions": [
+              {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "ColumnBindingInfo": {
+                  "TableName": "任务表",
+                  "ColumnName": "项目ID",
+                  "GUID": "25809070-f2d3-4c8a-aa77-b00ec7760e83"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增报工!项目ID"
+                }
+              },
+              {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "ColumnBindingInfo": {
+                  "TableName": "任务表",
+                  "ColumnName": "进度",
+                  "GUID": "f1df6e65-db3e-4d71-8f3e-24958a07ec65"
+                },
+                "Value": "2"
+              }
+            ]
          },
          "CustomColumns": []
        },
@@ -555,7 +569,7 @@
                    ]
                  }
                ],
-                "ID": "45f46f1e-ef3d-4a74-b98b-1a68bc3d134f"
+                "ID": "a5293aa2-316a-4a3b-af61-fac6860e8b26"
              }
            ]
          }
@@ -692,7 +706,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "2a5f91bc-4236-4206-8eaf-83c8d2a7e40f"
+                "ID": "c7f65013-95d7-45d0-a28d-91ac1348f5af"
              },
              {
                "CommandList": [
@@ -804,7 +818,7 @@
                            }
                          }
                        ],
-                        "ID": "e8f0f30f-dc17-45e0-9e40-727e8dc8c4da"
+                        "ID": "08fe637d-0de7-4e60-ab6c-08fc9ef6c7b5"
                      }
                    ]
                  },
@@ -818,7 +832,7 @@
                    "Title": "加载中"
                  }
                ],
-                "ID": "da2eae93-452c-43e7-bd2b-a1980ed287aa"
+                "ID": "16ebeb33-6f8a-4f3e-90b4-53ef63568f97"
              }
            ]
          }
@@ -1132,7 +1146,7 @@
                                          "ReloadData": true
                                        }
                                      ],
-                                      "ID": "10582620-c86d-4d60-9e53-a488c3f99a17"
+                                      "ID": "82388974-49d2-4706-927e-33603bd48eba"
                                    },
                                    {
                                      "CommandList": [
@@ -1147,12 +1161,12 @@
                                          "BtnText": "知道了"
                                        }
                                      ],
-                                      "ID": "1a8ee6d7-831d-406c-a72e-1564175d08ff"
+                                      "ID": "a426b464-72ce-44fe-a92f-24d1178580ae"
                                    }
                                  ]
                                }
                              ],
-                              "ID": "1e58143b-e41d-44bf-ac88-5e254778b33d"
+                              "ID": "725cbf1f-08d3-4427-893d-ed62c31e1e7a"
                            }
                          ]
                        }
@@ -1229,7 +1243,7 @@
                    ]
                  }
                ],
-                "ID": "ebfbfc1e-f449-4e1b-8055-52ac57ab2bfb"
+                "ID": "f8f31b87-4135-4c38-bdcb-86691219f0b9"
              },
              {
                "CommandList": [
@@ -1244,7 +1258,7 @@
                    "BtnText": "知道了"
                  }
                ],
-                "ID": "652dc1d8-9eca-4941-b2db-b6b1ed86e194"
+                "ID": "9f436a49-9bee-45c7-8b16-efa42f6d0302"
              }
            ]
          }
@@ -1656,7 +1670,7 @@
                ]
              }
            ],
-            "ID": "3f9f4d0a-fbda-4c76-8871-64a0b886ad50"
+            "ID": "1189092a-0588-4b5c-83d2-5eea7b58552f"
          },
          {
            "CommandList": [
@@ -1673,7 +1687,7 @@
                ]
              }
            ],
-            "ID": "3365816b-8067-46d2-8f98-dc34aa82cc8e"
+            "ID": "884df376-c65e-47eb-9374-9e342b5f6f7b"
          }
        ]
      }
@@ -1702,17 +1716,21 @@
  },
  "CustomNames": [
    {
-      "Name": "任务ID",
-      "Formula": "新增报工!$B$3"
-    },
-    {
-      "Name": "项目ID",
-      "Formula": "新增报工!$B$30"
+      "Name": "版本ID",
+      "Formula": "新增报工!$B$32"
    },
    {
      "Name": "报工人",
      "Formula": "新增报工!$B$7"
    },
+    {
+      "Name": "仓库ID",
+      "Formula": "新增报工!$E$31"
+    },
+    {
+      "Name": "分支名称",
+      "Formula": "新增报工!$B$31"
+    },
    {
      "Name": "工时数",
      "Formula": "新增报工!$B$15"
@@ -1721,25 +1739,21 @@
      "Name": "工作进展",
      "Formula": "新增报工!$B$23"
    },
-    {
-      "Name": "开始日期",
-      "Formula": "新增报工!$I$30"
-    },
    {
      "Name": "结束日期",
      "Formula": "新增报工!$N$30"
    },
    {
-      "Name": "分支名称",
-      "Formula": "新增报工!$B$31"
+      "Name": "开始日期",
+      "Formula": "新增报工!$I$30"
    },
    {
-      "Name": "仓库ID",
-      "Formula": "新增报工!$E$31"
+      "Name": "任务ID",
+      "Formula": "新增报工!$B$3"
    },
    {
-      "Name": "版本ID",
-      "Formula": "新增报工!$B$32"
+      "Name": "项目ID",
+      "Formula": "新增报工!$B$30"
    }
  ]
-}//t1JPrwrnfmF2E1ERN6KRsKw6Nrv169QVUPCNjGdGTCKFBvcaXuKnBVdCkFz59e2JOsK5R3YKtDGOaqkADGhckcgkXsaUZyalAsVhqZgCQyX/9/0xnW+wM1c6XcmASA8QSiQ5LXIxdv7HPUVcecC7qi1r1TRP3XoX8bCcVwx2o4hb3oV7SJYfVuuTItPpPF2P40rTXn5UueR49eqBb5l1lz80fc9xEb9L4ah7yx2BvVA7t0YwQr8xm1OutXyPrVbw7/mMNFs+zYD0dbXPRB/JNa8soxEdcICQlpRj5xhXFDCc5EM49sAn5c/7JqbqlbaitGl/qDfQkLUr1HBHFntcV5aXXzDXF5J3lJVFXjl2sNbQYD4ipPUCfjbCtntmVRb94G7d2Nbhnbt7BpxAmYAcyEzrL8W/59xmmUGaeeElU0TBxoFhigMjLg0z0PCq69bfylGDs0GSnImbMzpBLZOx2O1yFG4Pu2DrnSs436TvJzRvu3uZsKV+tREcjGjlsOwAUEijYUq4JwxlR4ESjKzQp1wV5hzvkXDD9Q1MIWbEwOlQN991gxaLISLPEUn6A7QqynzebjFkR1dp1MCWdR6Q/udk877Pu9apJegsgluLzwgkJIaszT08s12z2/CD7cB08MvSmRdhDyq0r3jZ3mCpS+qrBgSIrM6CYsaUas+NinlEqg50i49BTETmh4otHZBChWILNkge3kunRbWhZYWAyFpDaFR/xCAEIRt6Cmj4NNKyn/s3dJR7T0S3hxpX6IJXw42YdNs7rnPq2Yqg6qqNNg6PAMWT1+OTgAzt5hfIBExvcBTP2mX+NNj3A8jIuCe4pTT6mvgXXDD92LY/iE0gfGtjDGuCbCX2g2Vooh1x2fYJD/QLT5v387dgY6Aa6+7gLbcwdmOq6/01BYWpwLvNGw==|920
+}//UISP4TRBhhFniiNMvMwCV+kENdsOcSeWsUOBmQLtLtVHBmit6j5Hc1zbbYrC9diF+016Dl+wzwJESCUf9kY9ivvJ5X8MQBNi0NZ/Eqhax6EbNMMk6ASETwIb9p80Djg19SX7Uc6/fYa6AgzOVOtVfA/oR53hZR07xE5ZzPzm3DzFkQZDNB3/+aUgoggNB+9kF8U7lqLWZQZIu+tR8EqCsSevDGc65rBPw6CpvRH0BrTNZV7u9fnfOU3ugoWALEBFYqL2Gz4AzzLqHlG8o1eX9DkAYGVf+wr7hWPpTibVTFHb95OzTms0Z9/xyKGXZ/ap72D/zkUlLD1qcAu3AmEmHYOho13/joF98SVotvmKnyJmu059rDB3wVxSUYLWYV/kDaKxWUvxBcEVCxMkcLkCLfbkbwcP0hc4snpMYmj6dQiY7OJi06SnxZ0YRGSEJyUa0v+xv7VAKg3j1T4QkjRkVh1+DIuW8tsPrnt/JCqH6zSIEHGPkVuTFYmgCZUOpdyMK5QTbm3yQCtdtBZ8RYc9kvltMjKF7u47UaWFLQkrkX15oKQdaZpDBAHaerHJBdkGGOzil3jkwosePeEeY/vOY16lLWCImS6pCmdGv467XOGJj0Vh3Oy9ghyDTWLEJ8n2ryDbfZk4qANFHOH46QDMvQaEfSJKof2i49xGDX7HudvHw3B/C/qoWHjV5sA0DbRbfjWvQT3MaElb6rWL/ODOiHj0XvS7kjwCHkVXu6nqnWBbrSk7VBFmZFwH/Jg3X+zE6X34Yo+aX57ajaVeMljHF6pu2NxIvABIvs2mPmXjDdKlNdLQ84d3S9kdwl/u79mNc14jfLoiB5EBQYSclc/UOyhL1NlJEy59K7sesL3vK25pKFJXynvQaLTI41jESr9Jwej+m6K8H0xG/i5cnhURQQ==|920
--- a/Pages/任务/工时/新增报工.rd
+++ b/Pages/任务/工时/新增报工.rd
@@ -8,17 +8,21 @@
  },
  "CustomNames": [
    {
-      "Name": "任务ID",
-      "Formula": "新增报工!$B$3"
-    },
-    {
-      "Name": "项目ID",
-      "Formula": "新增报工!$B$30"
+      "Name": "版本ID",
+      "Formula": "新增报工!$B$32"
    },
    {
      "Name": "报工人",
      "Formula": "新增报工!$B$7"
    },
+    {
+      "Name": "仓库ID",
+      "Formula": "新增报工!$E$31"
+    },
+    {
+      "Name": "分支名称",
+      "Formula": "新增报工!$B$31"
+    },
    {
      "Name": "工时数",
      "Formula": "新增报工!$B$15"
@@ -27,25 +31,21 @@
      "Name": "工作进展",
      "Formula": "新增报工!$B$23"
    },
-    {
-      "Name": "开始日期",
-      "Formula": "新增报工!$I$30"
-    },
    {
      "Name": "结束日期",
      "Formula": "新增报工!$N$30"
    },
    {
-      "Name": "分支名称",
-      "Formula": "新增报工!$B$31"
+      "Name": "开始日期",
+      "Formula": "新增报工!$I$30"
    },
    {
-      "Name": "仓库ID",
-      "Formula": "新增报工!$E$31"
+      "Name": "任务ID",
+      "Formula": "新增报工!$B$3"
    },
    {
-      "Name": "版本ID",
-      "Formula": "新增报工!$B$32"
+      "Name": "项目ID",
+      "Formula": "新增报工!$B$30"
    }
  ]
 }
--- a/Pages/任务/工时详情.json
+++ b/Pages/任务/工时详情.json
@@ -219,9 +219,9 @@
  },
  "Values": {
    "1,1": "整体进展",
-    "3,1": "预算工时",
-    "3,7": "计划工时",
-    "3,12": "实际工时",
+    "3,1": "可分配",
+    "3,7": "可报工",
+    "3,12": "可报工",
    "3,18": "完成比例",
    "6,1": "工时明细",
    "7,1": "工时详情-列头",
@@ -233,27 +233,6 @@
    "6,4": "\"当前项目采用的工时分配方式是【\"&工时分配方式&\"】\""
  },
  "AttachInfos": {
-    "3,3": {
-      "BindingInfo": {
-        "TableName": "任务平行视图",
-        "ColumnName": "任务预算工时",
-        "GUID": "18f09411-df60-4f43-9bde-6568a5ab20e2"
-      }
-    },
-    "3,9": {
-      "BindingInfo": {
-        "TableName": "任务平行视图",
-        "ColumnName": "成员计划工时",
-        "GUID": "5af96d1d-0613-422f-b010-894384af003f"
-      }
-    },
-    "3,14": {
-      "BindingInfo": {
-        "TableName": "任务平行视图",
-        "ColumnName": "成员实际工时",
-        "GUID": "26afde84-5430-48dc-a46a-cbe0a418c06a"
-      }
-    },
    "3,20": {
      "CellType": {
        "$type": "ElementUI.ProgressCellType, ElementUI",
@@ -656,9 +635,9 @@
    "3,20,1,6",
    "12,7,1,3",
    "12,10,1,4",
-    "3,9,1,2",
    "3,14,1,2",
-    "3,3,1,2"
+    "3,3,1,2",
+    "3,9,1,2"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -712,6 +691,10 @@
    "Margin": {}
  },
  "CustomNames": [
+    {
+      "Name": "工时分配方式",
+      "Formula": "工时详情!$K$13"
+    },
    {
      "Name": "任务ID",
      "Formula": "工时详情!$B$13"
@@ -719,10 +702,6 @@
    {
      "Name": "执行人",
      "Formula": "工时详情!$E$13"
-    },
-    {
-      "Name": "工时分配方式",
-      "Formula": "工时详情!$K$13"
    }
  ]
-}//Yx72njDQTmUkwbboT0gfbOpio+BWK/W/exQ2yaSZrv86RcYDMbca/8Owt6GbGL5CICiodsnTYVRXQOij7YoehwroVxIOar7n1lYbohKM4J4JHiAqszNpbg+2XN96yXoArD4/ngj8+nK1jfcvGkjbbRVMRefQTg1+VHnKuTT9u9EzF1D3SOEVFgivbiBwjoKcx6kYjpwPLaedE5+Kga3hL84veWaKdNrsEPKDV29l6Pqw1kzPKBxuv0ruS5FtpMnoWaZO/Ypqk35G7qCNgKxNoj/UIqhNsB0yInektowZ2l3xHhRnz9Nfaln2EtW/p4W+TeHnQ4mxvkE4Df4fOS3VebJUQ1Ord0R66ylaP2oUBH/Sxlk+UfmRwUuJfGio/r12CF7r6fD9c4gHQ66YHzZVXtqCsItLAicqI9yOZAjrfu6dXFc8CI896qswOSGXjmdNM3DYYNBwtUuiZjeGtxBlH2eWbx6dS4ibGDOPLos4DJBnbb1COzaSV2Wglw2QfKWblywZbWzNXSLdn3tCaHpwkFPncduttbFU1RscVvG3kecfKfzOS2Us8GBTgkUCn9K2U+4gKiNx7E6vxahHE2GycDtRFX9V27Ts3fF9+HU9G/aH4I5RzGh7d4hYIvELhCFWDW0RpxmpCX13EuW2atXjbQ9YArJ9ymawFVIbzPgPAEsnmBuok9+OC14g7sfCLAp8JEsfjXY39cxEq9garBVvJ9uNQzlqn36s3NPUIucOviUfAXtuDGkNPRyZtt0jvlwAFbgqa3uUD4VS815jSEWN9WtbvY7r+U7w1th+4zTNgNjOcIHziJfcArBV9yxrziqFdC19Mer3NifCr0iOdpqr8aERmQWtebEhfGBGH2afFcY6BP/SEcnOIvsX85+UJ1N/T7lKR4fd/9wZBOK0QxLklA==|920
+}//q5i0UYeToEoiWOrZvUlA+Az+urNpyIkanCO3zUbrS1vLN+bSkABk6lQc7sU6v69BtbrP25yR320pI0KEF4pQ772L3CFSGg6+hpb1Ww/kdikh4ht0OhcUVVsCX2pXdbaBsZZa6FOb8co2yZyb28yn7O543r8couSIN06pASPxiXiQwrzjofgGBMPlzXZ6mOQOkhXaLYE1Mj9wcgQ6zxhdAz4vBvJtZkkfoKpOz0AiktjXc/TjXMuc6qSFu3D34doHGGaAI2a+r7hB03F+tz27orCkrpfq6EgdHXoJwiHJgJWDj8hnRNo7/vthlfLLWGXC27waP4dSB98Tb/4E2WiCK4VLqBQPIG/5/b+CBWvl/FyWl6IGjEDLqOhl3DbJzOLsgNBZrLfnrS7lg69mgVh+T9pfnORlnE7AXLSGochTYXlgAsYN5psQ6/0vXfRR3ctINZIoC11BPosnV+u/CNggS/9CMsJmwdwzt5MNLu8r6IAjv/aMfcOY+rrKaIQxXvHctOpomFzWT2xxpJAwVibf2MmgAsIcLX/WTTd79vzIF2yoDAxjkPClJ0yJ/puZR5b1wl49Vnym3SXK3MzS2ULrfFoDRozkMiAOPlOss2NRLvR1AWNgIMfelzvVu6XOhkAzFqrKVnZl5G0pnGqpYVU2O8MYekvLgZCrQD4wjpy9ZsX5PHorpIMJK4WYEZXMaPQdrdaOgQbEdGf+UKBioCN50dfO/EGeIQj95oD5yDw9r5bljAroFNBGINL2EvUN/dv7VHoQw826HzcQmMsgmptiTnkh9o2P3qBF2AZG6iVxPQXvEe55VOU0trT0vqr+EID9tL2ACHZsltOoofOh6bZW2t6KDPyWjqommr8/3XaJCKylhF5t/YwXL54cPIYn7V7X+MrJ8m8Z5VhHbIYScU6cBw==|920
--- a/Pages/任务/工时详情.rd
+++ b/Pages/任务/工时详情.rd
@@ -7,6 +7,10 @@
    "6,4": "\"当前项目采用的工时分配方式是【\"&工时分配方式&\"】\""
  },
  "CustomNames": [
+    {
+      "Name": "工时分配方式",
+      "Formula": "工时详情!$K$13"
+    },
    {
      "Name": "任务ID",
      "Formula": "工时详情!$B$13"
@@ -14,10 +18,6 @@
    {
      "Name": "执行人",
      "Formula": "工时详情!$E$13"
-    },
-    {
-      "Name": "工时分配方式",
-      "Formula": "工时详情!$K$13"
    }
  ]
 }