{"Message":"优化任务页面","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/项目列表"},{"State":1,"Type":1,"Name":"PCPage/项目首页"},{"State":1,"Type":1,"Name":"PCPage/任务列表"},{"State":1,"Type":1,"Name":"PCPage/项目配置首页"},{"State":1,"Type":1,"Name":"PCPage/任务首页"},{"State":1,"Type":1,"Name":"PCPage/任务部分"},{"State":1,"Type":1,"Name":"PCPage/任务-任务信息"},{"State":1,"Type":1,"Name":"PCPage/任务-关联资源"},{"State":1,"Type":1,"Name":"PCPage/任务-子任务列表"},{"State":1,"Type":1,"Name":"PCPage/任务-工时"},{"State":1,"Type":1,"Name":"PCPage/任务-进展"},{"State":1,"Type":40,"Name":"Plugin"},{"State":3,"Type":36,"Name":"ShareCommandContainer/打开任务详情"}],"Version":"v1"}

2024-04-06 21:28:11 +08:00
parent e539da70f4
commit 9344eb484c
26 changed files with 701 additions and 1120 deletions
--- a/Pages/任务/任务-任务信息.json
+++ b/Pages/任务/任务-任务信息.json
@@ -130,7 +130,7 @@
      },
      "14": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0,
+          "DesignLengthInPixel": 44.0,
          "Mode": 2,
          "MinLength": {
            "Unit": 1
@@ -140,13 +140,13 @@
          }
        }
      },
-      "27": {
+      "20": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 32.0
        }
      }
    },
-    "Count": 28,
+    "Count": 21,
    "DefaultSize": 32.0
  },
  "Values": {
@@ -155,7 +155,8 @@
    "3,1": "任务说明",
    "3,2": "编辑",
    "7,1": "备注",
-    "7,2": "编辑"
+    "7,2": "编辑",
+    "10,18": 0
  },
  "AttachInfos": {
    "0,1": {
@@ -187,7 +188,7 @@
        }
      }
    },
-    "0,27": {
+    "0,20": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -197,7 +198,7 @@
              {
                "TargetCells": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-任务信息'!Z11"
+                  "SerializeProperty": "='任务-任务信息'!S11"
                },
                "Value": "0"
              }
@@ -300,7 +301,7 @@
        "noMatchText": "无匹配数据"
      }
    },
-    "1,27": {
+    "1,20": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -310,7 +311,7 @@
              {
                "TargetCells": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-任务信息'!Z11"
+                  "SerializeProperty": "='任务-任务信息'!S11"
                },
                "Value": "1"
              }
@@ -355,7 +356,7 @@
                          "ShowConfirm": false
                        }
                      ],
-                      "ID": "4e9e1367-5d07-41f1-b120-db84370b6c9d"
+                      "ID": "2130d738-d6b6-4419-b89a-479a61c118e5"
                    }
                  ]
                }
@@ -443,7 +444,7 @@
                          "ShowConfirm": false
                        }
                      ],
-                      "ID": "89fe97cb-dec4-4315-a25d-9495b2c324a8"
+                      "ID": "dbc59390-710a-4624-a77b-65bb1c60cd25"
                    }
                  ]
                }
@@ -499,7 +500,7 @@
        "ReadOnly": true
      }
    },
-    "10,25": {
+    "10,18": {
      "CellType": {
        "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
        "Caption": "折叠",
@@ -515,7 +516,7 @@
                },
                "Value": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=NOT('任务-任务信息'!Z11)"
+                  "SerializeProperty": "=NOT('任务-任务信息'!S11)"
                }
              },
              {
@@ -525,7 +526,7 @@
                },
                "Value": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-任务信息'!Z11"
+                  "SerializeProperty": "='任务-任务信息'!S11"
                }
              }
            ]
@@ -559,9 +560,6 @@
        "HorizontalAlignment": 2,
        "Underline": false
      },
-      {
-        "FontSize": -1.0
-      },
      {
        "FontFamily": 0,
        "FontSize": 13.333333333333332
@@ -577,6 +575,9 @@
        "HorizontalAlignment": 2,
        "Underline": false
      },
+      {
+        "FontSize": -1.0
+      },
      {
        "Foreground": 6
      }
@@ -594,76 +595,61 @@
    },
    "CellStyles": {
      "0,1": 0,
-      "0,27": 1,
-      "1,27": 1,
+      "0,20": 1,
+      "1,20": 1,
      "3,1": 2,
      "3,2": 3,
-      "3,15": 4,
      "4,1": 2,
-      "4,2": 5,
+      "4,2": 4,
      "5,1": 2,
-      "6,0": 5,
-      "6,1": 6,
-      "6,2": 5,
-      "6,3": 5,
-      "6,4": 5,
-      "6,5": 5,
-      "6,6": 5,
-      "6,7": 5,
-      "6,8": 5,
-      "6,9": 5,
-      "6,10": 5,
-      "6,11": 5,
-      "6,12": 5,
-      "6,13": 5,
-      "6,14": 5,
-      "6,15": 5,
-      "6,16": 5,
-      "6,17": 5,
-      "6,18": 5,
-      "6,19": 5,
-      "6,20": 5,
-      "6,21": 5,
-      "6,22": 5,
-      "6,23": 5,
-      "6,24": 5,
-      "6,25": 5,
-      "6,26": 5,
-      "6,27": 5,
-      "7,0": 5,
+      "6,0": 4,
+      "6,1": 5,
+      "6,2": 4,
+      "6,3": 4,
+      "6,4": 4,
+      "6,5": 4,
+      "6,6": 4,
+      "6,7": 4,
+      "6,8": 4,
+      "6,9": 4,
+      "6,10": 4,
+      "6,11": 4,
+      "6,12": 4,
+      "6,13": 4,
+      "6,14": 4,
+      "6,15": 4,
+      "6,16": 4,
+      "6,17": 4,
+      "6,18": 4,
+      "6,19": 4,
+      "6,20": 4,
+      "7,0": 4,
      "7,1": 2,
-      "7,2": 7,
-      "8,0": 5,
+      "7,2": 6,
+      "8,0": 4,
      "8,1": 2,
-      "8,2": 5,
-      "9,0": 5,
+      "8,2": 4,
+      "9,0": 4,
      "9,1": 2,
-      "10,0": 5,
+      "10,0": 4,
      "10,1": 2,
-      "10,2": 4,
-      "10,3": 4,
-      "10,4": 4,
-      "10,5": 4,
-      "10,6": 4,
-      "10,7": 4,
-      "10,8": 4,
-      "10,9": 4,
-      "10,10": 4,
-      "10,11": 4,
-      "10,12": 4,
-      "10,13": 5,
-      "10,14": 5,
-      "10,15": 5,
-      "10,16": 5,
-      "10,17": 5,
-      "10,18": 5,
-      "10,19": 5,
-      "10,20": 5,
-      "10,21": 5,
-      "10,22": 5,
-      "10,23": 5,
-      "10,24": 5,
-      "10,25": 5
+      "10,2": 7,
+      "10,3": 7,
+      "10,4": 7,
+      "10,5": 7,
+      "10,6": 7,
+      "10,7": 7,
+      "10,8": 7,
+      "10,9": 7,
+      "10,10": 7,
+      "10,11": 7,
+      "10,12": 7,
+      "10,13": 4,
+      "10,14": 4,
+      "10,15": 4,
+      "10,16": 4,
+      "10,17": 4,
+      "10,18": 4
    },
    "ColStyles": {
      "1": 8
@@ -676,11 +662,11 @@
  "Spans": [
    "3,2,1,3",
    "7,2,1,3",
-    "10,25,1,3",
+    "10,18,1,3",
    "1,2,1,8",
-    "4,2,2,26",
-    "8,2,2,26",
-    "0,1,1,25"
+    "4,2,2,19",
+    "8,2,2,19",
+    "0,1,1,18"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -709,7 +695,7 @@
  "CustomNames": [
    {
      "Name": "折叠任务说明",
-      "Formula": "'任务-任务信息'!$Z$11"
+      "Formula": "'任务-任务信息'!$S$11"
    }
  ]
-}//nyAST56G9WITROuOnDFE4vjZXgfnAwIbtDv/EJIf/RgKnN4dsa+lj4m7Blpab1Tr9RGjcRgTxtLgR6LL22wuiy0wiw981kG2XSTgCiTbJ7OINApATEMonK3Y5boEBSNLBN0vcAyZglN+QVt7LJFehPaZdy04vea/XS3MGAeqiHD5az9ScduP5M6C6ePCMexp6a2zS6i66EOrOYumNa9N6z1312n4kzQns5Qrlio3zDjOI4eFZMLh+3pAlLAldl9YuWJeQ3GS0LPxR0K1mTu3rQKifzPmHiHTRQvywPquKyxXWk2EqQr071M/5/fquHQ7B964OJ0Vs/i9XgOm49kPDgvQ7grb9lJNtG6D5vnuW46LwAXUBEZfRjombVDIrBo6Wbxpui8LIUBTXXEedpctfG2TaaWWxzF86WPLenzO08VyZmt9d27GZinD9ocguG1J62zJVc3+Yg909uLjttKULE5uTXEao8Bh+BIktlVlqKmIiS3NV8JI5wtaEBYO13hBF9UuH82ntOl+BKxJlVmlvKdfhCtzwLLae0dWR1ktsh5AWAF20SSknPLqBX7T/3gSFmgBmserNun39aVpBpbBR5tfi+XWXreavJM5mSSUdgfryDwwmySIO37vyDcjiBMUw2We0xThR96qvBttZsHSEnWi8dHP0jPT8Wcew6unPj4pnjfKfq480wyLc7UxDRBDg7GxEeNNUjoFPepUAGITV6N+a7ySoIZe/XoJHn4fULMoGQon6srMh54OpmWCnByiIQrUvg6Uqy4BjOIEHJfnzCHPjV46idDiyMDE0+Bx+iYeTtc0TJUR1nrW5HEASw3bSvF6PwXTskarQtZOMM2rHcJgbdrdtNdOTl0wXPcsaWPVvlhqzpFR6Vmz2KR5wr8NjRarFkTh8ZlSCSSbVHbadw==|920
+}//iFTQ4Ibsp70DO3nvjuapi8o1nPbBRZQphF7/YEmKSZLZ9eTFc3N0r93/YWoICkjXrQJqiONvZM1ZsuP+lggMN1NdShpVN196+OxIrO5EHYHKC3rKZqTSDpqDt5ZrXTJgSLG7rhIDIVgXoJtGizd5kv59hwVh6Y6JziRzLcv0pnSSvWNVHTOyp8pByGcjMifK0j0Q0OHjeVSyAoFrXsr52Fjf477auaZmVtgRDr2AgkkdWm2YUs4F+u2glFJcmknIrjmryILm14peNSGVdZO4Rc6griaagEeKJ50NDxM+0rG1wafjWz6pYSmRyF1zcW1RfpsaiZWoZUbCuicDuuvBjQ/ddGXuvgyRQh0/hEAU8twweeHsQtugwlZqowh5oItNbHjeE5bBNpFXVFb+GvPP07NDlFoH7A7yn8AHD0E6RAJc8wxCHf7a4TjYtqUAyM1y+H+SXzuBgmNfahdpuYkqKYet2rG9ZbljAzICHiNuirIQl9CQBPjI48mkGdYnFuLoqhfF0C03wgnK6CGA4Xiq/gX8ZQqAfZM1A2kEZIHUuqOsqel7vhVeXEjKoNhkT2xilVvMzXGLz9Ayfehw/AZbMEc4eaf721+5uB+hmoUPhJsI02JxsAxdXDJlITGHT9rpoPWgW9AJDIdwgNkQMqQw2tHq3SX1v7KWBIJ5cHAXFsWrtsIdgon9LBbFrGjNXCq96itIV6N5J6LrPFyjg+HzGqtK0cUuT4qOh82Meio1Vrbl419T6uPpDwrzDmJtOJ8xMj7GX5eEsjXZsyokfCZdbh9IRqIgeQjDzC06hyeGrO63L3ZZn4878OVquufbWZ4PbZLXwDBaw6SYiwzL9ZYLK4T0JajK3YVE5nPqMxXwcLPY09e2XNKSjNdvBMpyIBaNjQ++ACto2DAMK2oW37sGyg==|920
--- a/Pages/任务/任务-任务信息.rd
+++ b/Pages/任务/任务-任务信息.rd
@@ -1,11 +1,11 @@
 {
  "PageType": 0,
-  "ColumnCount": 28,
+  "ColumnCount": 21,
  "RowCount": 11,
  "CustomNames": [
    {
      "Name": "折叠任务说明",
-      "Formula": "'任务-任务信息'!$Z$11"
+      "Formula": "'任务-任务信息'!$S$11"
    }
  ]
 }
--- a/Pages/任务/任务-关联资源.json
+++ b/Pages/任务/任务-关联资源.json
@@ -105,7 +105,7 @@
      },
      "12": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0,
+          "DesignLengthInPixel": 42.0,
          "Mode": 2,
          "MinLength": {
            "Unit": 1
@@ -115,28 +115,19 @@
          }
        }
      },
-      "13": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "14": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "27": {
+      "20": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 32.0
        }
      }
    },
-    "Count": 28,
+    "Count": 21,
    "DefaultSize": 32.0
  },
  "Values": {
    "0,1": "关联资源",
-    "1,1": "关联资源"
+    "1,1": "关联资源",
+    "4,16": 1
  },
  "AttachInfos": {
    "0,1": {
@@ -168,7 +159,7 @@
        }
      }
    },
-    "0,27": {
+    "0,20": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -178,7 +169,7 @@
              {
                "TargetCells": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-关联资源'!X5"
+                  "SerializeProperty": "='任务-关联资源'!Q5"
                },
                "Value": "0"
              }
@@ -190,7 +181,7 @@
        "UseCellForeColor": true
      }
    },
-    "1,27": {
+    "1,20": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -200,7 +191,7 @@
              {
                "TargetCells": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-关联资源'!X5"
+                  "SerializeProperty": "='任务-关联资源'!Q5"
                },
                "Value": "1"
              }
@@ -247,10 +238,9 @@
        "IsSmallButtonMode": true
      }
    },
-    "4,23": {
+    "4,16": {
      "CellType": {
        "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
-        "CellDefaultValue": true,
        "Caption": "折叠",
        "Style": 1,
        "CommandList": [
@@ -264,7 +254,7 @@
                },
                "Value": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-关联资源'!X5"
+                  "SerializeProperty": "='任务-关联资源'!Q5"
                }
              },
              {
@@ -274,7 +264,7 @@
                },
                "Value": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=NOT('任务-关联资源'!X5)"
+                  "SerializeProperty": "=NOT('任务-关联资源'!Q5)"
                }
              }
            ]
@@ -326,9 +316,9 @@
    },
    "CellStyles": {
      "0,1": 0,
-      "0,27": 1,
-      "1,27": 2,
-      "4,23": 3
+      "0,20": 1,
+      "1,20": 2,
+      "4,16": 3
    },
    "ColStyles": {
      "1": 4
@@ -339,9 +329,9 @@
    }
  },
  "Spans": [
-    "2,1,2,27",
-    "4,23,1,5",
-    "0,1,1,25"
+    "2,1,2,20",
+    "4,16,1,5",
+    "0,1,1,18"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -369,7 +359,7 @@
  "CustomNames": [
    {
      "Name": "折叠关联资源",
-      "Formula": "'任务-关联资源'!$X$5"
+      "Formula": "'任务-关联资源'!$Q$5"
    }
  ]
-}//o53lBUBAY4nE4Cy95jgIjdR5tRJ6gU77LVaU9MwEKJW+2AB3C/aSDOIdHi3U7VJ7AxeciZdHFGTJIiHbAbCG48zyfJat1LwLR3K5Vs/Lvlayk9uQYEAz3V+nN6mjYcGORuAqS31k6JIUN1bT0a0tuIF9XqQCnUl+mEHMnkJgylCiTdty3KNnuvwvdJqhJ2nIeTD0iJ3vaRD8ojann3ah6WCfK3xYESuJToQvJZ70fxqD/CzNZq0wLXJEa6+RIugsmmYy8CmBfzUgF0uDHYzltNSpT2P5nU5E+0bjDMlk1sD14Kb4ZAaikkXFtWZujz5VIpIzX6TsxfBsMp3F/wjIW5QZQloK+jprjBLkvUowU3e58V26b1a936zy/S1Zq/WHqa2m544ePRO82gEZpAWfmDnQnD2buOSOPW7LEqAP3WYUGM94iuRmD3PSpnstopHloPoI3ttABw/JRiEWoP3qoO0j/71sIGGgZhKj9io76+Kxsk9bc/mCS29pXT42fWhk/ksHnmI0NpW5BPvKUcXQu0ll1LoyhTbUd/JPwd4++juURBUgsU4UpNHV3/R8EJuJZEChUro9pTL0Gmg3wsz1oytMzTtyGYEqnwegmXgrc6bq9XIESL7+K5O7awzjWb1v2wnp5popySldTNNhp/yoGF4eGWaim66S4gPtzz3X2RzFpQ/L/qY7s+xuZyt4iw3f39Dbt48z3yT1kqQ9Aui2sHpvEne0QuVge6KPR/16Vp4Tm/NJ5YpjUFcwcbPWs8JFTSWWoErj2NxE4x1ClYhMo+oDtmi7b99FKEzwCB8EOopTyP8I+72i+pTyEP7Z/l/A4VO4fGTKHcU3UzrKZrapYDNzEAiFhCyHD8THaS8d7SqJhzo4XK3a55uqeGsRW01UyGqfLfAl1jN2T9+XWpQ+Ow==|920
+}//KrXpgABOqjV9zbLEwVgiyiLdRbhuimoj7Ps5TYarBcZl+vHs1TRKJaVesea+YNrnn5oC3AEqzaOuQj2l/aMbM4rMiFxFqFc4+A4J8oH70/f++xbt/ddUflFCnBqE9zpTe7am6eSCD0ZyX7vRwZR3JX/pO7WRJS9+AMdWNeSvUF9m8ZSRiNhe+s99ghKUBYPARjDOR2VLJBmTWumJ0KlKfX+lorigJQwN++Izb7u3HuH8CJHnK1l8peV7up0adJ7qPb8M1vf3uW37csxC36B8cTtP5WBD44WnWVPgQFXDR48n2dKpD5FIK/d4LFalBi2FVAW7hKyxqLE6pAQRHnOzntTBAbv/g4HZWD7ag53XABsMYvyreBWG5HOZIKAiQQS6KGL1itjjBAex4oC7NDNNq/SopQmihuvWG0/8hXaq3gGX48rSk/F2aQohuidLaGCMSrhRLHmuNB+Y1dQtfSSEZTXTeBYXkSm46LwUeVK7QKHcR7D3zYqSzwgoJzGqjwXg+HZFDqEdwVpm8guXi6AlcoTnmcoE+1R3/nk3k4i+RUAL1pSxr2vg3hF2BRZ5LM8DCQsBNQ4k6dlyhN9zCt3qswyit2TQ/4ZWiy0ion1WTQjX1viSAKwWk4k/9/71S06O8IyVZ2Ki0WmG3bHk+5G3U54SL8J6r+6UTTLScuIYUqyRgzpcI1GV+aKro97Ztk9I4/T8v1KFEYCmc3Nw/NJYRdZUSGhHNflFCU6YabxlR9Q9SHuiXDuibqJED2mA+JkDBEWRyscNQfkETQd4j0vNvmAmHLTycmkr+abauM+Gr/jHGSsJNQMJj5TOb/JHgR3qSQsIJDSCieBRhzuAtzq/qsEA2oyBTVH3Zjpk+IoivcPoXUiv/MeJ3q6a+5GcXEfe9cAJW9UrLbGfTq2sdHJMhg==|920
--- a/Pages/任务/任务-关联资源.rd
+++ b/Pages/任务/任务-关联资源.rd
@@ -1,11 +1,11 @@
 {
  "PageType": 0,
-  "ColumnCount": 28,
+  "ColumnCount": 21,
  "RowCount": 5,
  "CustomNames": [
    {
      "Name": "折叠关联资源",
-      "Formula": "'任务-关联资源'!$X$5"
+      "Formula": "'任务-关联资源'!$Q$5"
    }
  ]
 }
--- a/Pages/任务/任务-子任务列表.json
+++ b/Pages/任务/任务-子任务列表.json
@@ -97,32 +97,7 @@
      },
      "9": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "10": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "11": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "12": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "13": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "14": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0,
+          "DesignLengthInPixel": 39.0,
          "Mode": 2,
          "MinLength": {
            "Unit": 1
@@ -132,19 +107,20 @@
          }
        }
      },
-      "27": {
+      "20": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 32.0
        }
      }
    },
-    "Count": 28,
+    "Count": 21,
    "DefaultSize": 32.0
  },
  "Values": {
    "0,1": "子任务",
    "1,1": "子任务",
-    "1,2": "增加任务"
+    "1,2": "增加任务",
+    "5,17": 1
  },
  "Formulas": {
    "1,1": "\"子任务（\"&B6&\"）\"",
@@ -180,7 +156,7 @@
        }
      }
    },
-    "0,27": {
+    "0,20": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -190,7 +166,7 @@
              {
                "TargetCells": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-子任务列表'!Y6"
+                  "SerializeProperty": "='任务-子任务列表'!R6"
                },
                "Value": "0"
              }
@@ -243,7 +219,7 @@
        "IconSize": 14.0
      }
    },
-    "1,27": {
+    "1,20": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -253,7 +229,7 @@
              {
                "TargetCells": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-子任务列表'!Y6"
+                  "SerializeProperty": "='任务-子任务列表'!R6"
                },
                "Value": "1"
              }
@@ -385,7 +361,7 @@
              {
                "TargetCells": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-子任务列表'!Y6"
+                  "SerializeProperty": "='任务-子任务列表'!R6"
                },
                "Value": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -397,10 +373,9 @@
        ]
      }
    },
-    "5,24": {
+    "5,17": {
      "CellType": {
        "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
-        "CellDefaultValue": true,
        "Caption": "折叠",
        "Style": 1,
        "CommandList": [
@@ -414,7 +389,7 @@
                },
                "Value": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-子任务列表'!Y6"
+                  "SerializeProperty": "='任务-子任务列表'!R6"
                }
              },
              {
@@ -424,7 +399,7 @@
                },
                "Value": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=NOT('任务-子任务列表'!Y6)"
+                  "SerializeProperty": "=NOT('任务-子任务列表'!R6)"
                }
              }
            ]
@@ -484,14 +459,14 @@
    },
    "CellStyles": {
      "0,1": 0,
-      "0,27": 1,
+      "0,20": 1,
      "1,2": 2,
      "1,3": 3,
      "1,4": 3,
-      "1,27": 1,
-      "2,24": 2,
-      "2,25": 2,
-      "2,26": 2,
+      "1,20": 1,
+      "2,17": 2,
+      "2,18": 2,
+      "2,19": 2,
      "3,1": 4,
      "4,1": 4,
      "4,2": 4,
@@ -513,13 +488,6 @@
      "4,18": 4,
      "4,19": 4,
      "4,20": 4,
-      "4,21": 4,
-      "4,22": 4,
-      "4,23": 4,
-      "4,24": 4,
-      "4,25": 4,
-      "4,26": 4,
-      "4,27": 4,
      "5,1": 5,
      "5,2": 4,
      "5,3": 4,
@@ -537,14 +505,7 @@
      "5,15": 4,
      "5,16": 4,
      "5,17": 4,
-      "5,18": 4,
-      "5,19": 4,
-      "5,20": 4,
-      "5,21": 4,
-      "5,22": 4,
-      "5,23": 4,
-      "5,24": 4,
-      "5,27": 4
+      "5,20": 4
    },
    "ColStyles": {
      "1": 6
@@ -555,10 +516,10 @@
    }
  },
  "Spans": [
-    "3,1,1,27",
+    "3,1,1,20",
    "1,2,1,3",
-    "5,24,1,3",
-    "0,1,1,25"
+    "5,17,1,3",
+    "0,1,1,18"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -597,13 +558,13 @@
      "IsAutomaticStroke": false,
      "IsAutomaticFill": false,
      "Location": "24,72",
-      "Size": "957,272"
+      "Size": "740,272"
    }
  ],
  "CustomNames": [
    {
      "Name": "折叠子任务列表",
-      "Formula": "'任务-子任务列表'!$Y$6"
+      "Formula": "'任务-子任务列表'!$R$6"
    }
  ]
-}//CQlBD4PvupQrDCiRU6MnfknbHc4bchf5FjHSDniB9G80DocbsQfKJ/f34/UL6t5uO5d2W6fbeuu4yCKpHA+OzG8xsPOeL5bIpLjdbfvbj4GtP8OY/JyHb2l7engmqRYhk7xVZzcQjmVNHN9ajgQhzUsDJKOOJiGmBrlgO5JfepWwVHqtLNbe0WJP9FEb4f9q4XZEV+Yx8FO8As6sSokDkvYLHS4Lyv/UO2sxzKxa8tqZPy90+2xT+Ctcq7v2OidQCjH6M6F2gB0mtSTSi7LY9xdfUQtl47erl/d+X7aK2iKXtl3PgRM+V0hoiCWNa+wawSwItyD90RernTmUS0L/e8tDhxI5rxDHCG9VTJVj8YHAp7/kLVgkSSPq3EDE3bOu44uHWqdKbc1ZreCaacMcxZ/hF28ri7hJH1ez+0NgOq5fnnHGP1Rg6hTJ35URlbgyglQ4FuluB6J7jyYN35QQ1w3FnQnotqcQokwyBi68RQGPqJ7TWlZZcMBYY/yj5vPtnfiMbrvnZFWl+kHwxYuiFoltrCfSPa7iCwQK2yiSD9vOkcuG1P5IRF3bJXSVHvuru5qGt3inPror+qqx6/VEfeawHFKyF7CHG3kAA1+0GT7MUa+d/y8RskGjSJMxxEMTWPIhqb6eeW9wYTjBKWLZ9U8WYgNirZJOVwCvb5rBV/xqZ3U0tO1pzqN2oCM8eTxu+CVa6nOXPGEOOlwkiQ6MKzVNqZCRoYncXVuquZfShWmqdLeB4MJWoR+0KHpVZDdrNZNbfgnMDIAtlPE64M9wcgOyEM18F5tIQUZ4Kcc4kiYwKiyIKOVxEIO/TdYNIDQP6WzN/RCDACDs6oetZEJz9OgNyJj4EVD0P30Wt2vZtgbprHkoLozW6pMRIq/JHeWlOLBSW41mM7T3kmzt7NJuwg==|920
+}//pCdDeFq1i3wq7LSHTlj5TDC/Z04X0KMVr6hn/p+3LmoWJ7grcvyJ1hPrMeZ9fYpHFTOUSD0ITyORZIHH+zzQkfd6TkhcTX4bm8oATvpnwgvUWuCl0GxiuGolKzwzu2CXcV0TVLCtkBYNFnre80FWnEvJ/wnxl0TMtSCthCfAr23CkTtGotPEy3JMjNHzXQrUei9Uv/7boKk6sM+1y9zwKXM0ADhoHnXLD6Hq291+BIw9cQ0Kb65AC/Vti6Kr7xIhSKbji/MeIdllKvNXwruMCtg0bXsCwlUxaoxiTxD5HKG4hXIPs8Xk5nhoibk4eBxM4q98lR0Ui8gTFKLvO05LoEKsZaMH/rHmhMffz16Mapdpyiq4yhylJU0yqqUqkHzxYEdgvXalVkSqvev1C7yyf/7E1vei2fnMaP3Sfqoz/dgI69d/5msYGbGxHmR9muLafJf+E3bgPpU31m9qgwgv4igU/81CQfjPXOxjxBdK7YDQ/+tptK/v6uqvgZj9+Qn/4ssaikLdLHYMBvBJ4mhHSgc1GT/I3uGjQQLtj9MKXN1FLhI9MIaLc8DZFppiq/0PUHatZnYTovMYth4w2cQIMoEwdCXULkoHTDklM+nd3cVLUrm9oHRFq9YmwNAagw9oLpBTAMcL53P+4oiqLzuGyWFWcyihTYFYi5I1TRx7WhxCCg1hcboZus7Gyd78BNRNU0Seo/jT5Xw4fnETUddJk+YeIFy+AW+fPkmeMuxtMdBGq2VXuxNgInGXRlJGbhz+lhlrsgQE3h2U37NgJDFaWfmEtCwoZGyzYNsVPufyODHVhF7Qy1YpGLkhKvXA7hI5zRZ1S5uEso+DkgYXhBykGx2hvw8ITs+W89/HSKVWPscqV01sV57dYXqgnMoJBb4VAcSgUlcr1aLlOszMZYnhcA==|920
--- a/Pages/任务/任务-子任务列表.rd
+++ b/Pages/任务/任务-子任务列表.rd
@@ -1,6 +1,6 @@
 {
  "PageType": 0,
-  "ColumnCount": 28,
+  "ColumnCount": 21,
  "RowCount": 6,
  "Formulas": {
    "1,1": "\"子任务（\"&B6&\"）\"",
@@ -9,7 +9,7 @@
  "CustomNames": [
    {
      "Name": "折叠子任务列表",
-      "Formula": "'任务-子任务列表'!$Y$6"
+      "Formula": "'任务-子任务列表'!$R$6"
    }
  ]
 }
--- a/Pages/任务/任务-工时.json
+++ b/Pages/任务/任务-工时.json
@@ -165,7 +165,7 @@
      },
      "15": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0,
+          "DesignLengthInPixel": 54.0,
          "Mode": 2,
          "MinLength": {
            "Unit": 1
@@ -175,28 +175,23 @@
          }
        }
      },
-      "16": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "29": {
+      "23": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 32.0
        }
      }
    },
-    "Count": 30,
+    "Count": 24,
    "DefaultSize": 32.0
  },
  "Values": {
    "0,1": "工时详情",
    "1,1": "工时",
    "3,2": "计划工时",
-    "3,26": "计划工时",
+    "3,20": "计划工时",
    "7,2": "实际工时",
-    "7,26": "实际工时",
-    "11,27": 1
+    "7,20": "实际工时",
+    "11,21": 1
  },
  "AttachInfos": {
    "0,1": {
@@ -228,7 +223,7 @@
        }
      }
    },
-    "0,29": {
+    "0,23": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -238,7 +233,7 @@
              {
                "TargetCells": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-工时'!AB12"
+                  "SerializeProperty": "='任务-工时'!V12"
                },
                "Value": "0"
              }
@@ -251,7 +246,7 @@
        "UseCellForeColor": true
      }
    },
-    "1,29": {
+    "1,23": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -261,7 +256,7 @@
              {
                "TargetCells": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-工时'!AB12"
+                  "SerializeProperty": "='任务-工时'!V12"
                },
                "Value": "1"
              }
@@ -307,7 +302,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "f8a78c51-836f-402e-80bd-22e164df3134"
+                "ID": "d1812aad-7ab5-427f-b7b3-ac4f5e4a06e8"
              },
              {
                "CommandList": [
@@ -346,12 +341,12 @@
                            "LoadBindingDataOption": 1
                          }
                        ],
-                        "ID": "6bd2e166-6132-4eec-9818-188e4a2f7c34"
+                        "ID": "9d2b57be-d6cb-4f18-aa7e-0504e7ef4ca3"
                      }
                    ]
                  }
                ],
-                "ID": "f2eaf479-d494-43b4-9736-b18a74a0001e"
+                "ID": "b252d2be-40b6-456b-b3fe-d36632f47021"
              }
            ]
          }
@@ -360,7 +355,7 @@
        "TemplateKey": "Gost"
      }
    },
-    "3,26": {
+    "3,20": {
      "CellType": {
        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
        "CommandList": [
@@ -388,7 +383,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "ad37166c-46f5-46ba-8aec-4f88e8afe693"
+                "ID": "844e9cc8-f688-444a-8af6-28fced7acd87"
              },
              {
                "CommandList": [
@@ -427,12 +422,12 @@
                            "LoadBindingDataOption": 1
                          }
                        ],
-                        "ID": "e4013d7e-b88b-4482-a3fc-f3bfbb6fa33f"
+                        "ID": "52354edf-b7d4-4cda-8909-2826850975e5"
                      }
                    ]
                  }
                ],
-                "ID": "06d1f205-be7c-4891-874c-9b62ab9566eb"
+                "ID": "eaa4caa2-144b-4cf1-8be9-716c2fe32c47"
              }
            ]
          }
@@ -485,7 +480,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "7eff0387-78c9-4348-ba43-ab00a515bed6"
+                "ID": "36d86a32-3c0b-4989-aa18-4ba7c776258d"
              },
              {
                "CommandList": [
@@ -524,12 +519,12 @@
                            "LoadBindingDataOption": 1
                          }
                        ],
-                        "ID": "011742ed-b9f0-4a17-b38b-84987cd5ea6b"
+                        "ID": "74a8f4dd-323a-4e73-b1d5-e7b112423033"
                      }
                    ]
                  }
                ],
-                "ID": "bcf125b7-f937-4f6e-99e2-47dca9112eb5"
+                "ID": "19f628e0-5b9a-4d3a-8d06-4f56a3fd198b"
              }
            ]
          }
@@ -538,7 +533,7 @@
        "TemplateKey": "Gost"
      }
    },
-    "7,26": {
+    "7,20": {
      "CellType": {
        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
        "CommandList": [
@@ -574,7 +569,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "f0ec4d4e-7b17-4540-936f-8920f1137452"
+                "ID": "ce14dd0d-3a61-49d9-8ee4-937b10c4167b"
              },
              {
                "CommandList": [
@@ -613,12 +608,12 @@
                            "LoadBindingDataOption": 1
                          }
                        ],
-                        "ID": "e348772c-fb72-48aa-8154-3a501b5a7636"
+                        "ID": "400b6288-b3fc-45c0-8068-6b63ea70d844"
                      }
                    ]
                  }
                ],
-                "ID": "e8ee92da-f051-49ee-9bd9-cfe0d2a88e98"
+                "ID": "9f9b0923-44cd-4ff0-8314-719884dcb024"
              }
            ]
          }
@@ -801,7 +796,7 @@
        "hideOnSinglePage": true
      }
    },
-    "11,27": {
+    "11,21": {
      "CellType": {
        "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
        "Caption": "折叠",
@@ -835,7 +830,7 @@
                        },
                        "Value": {
                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "='任务-工时'!AB12"
+                          "SerializeProperty": "='任务-工时'!V12"
                        }
                      },
                      {
@@ -845,13 +840,13 @@
                        },
                        "Value": {
                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=NOT('任务-工时'!AB12)"
+                          "SerializeProperty": "=NOT('任务-工时'!V12)"
                        }
                      }
                    ]
                  }
                ],
-                "ID": "f288cf5e-2ff5-4344-a697-a6c45ced54bb"
+                "ID": "24d19063-fdab-41e8-b07b-7067357b8d4d"
              },
              {
                "CommandList": [
@@ -865,7 +860,7 @@
                        },
                        "Value": {
                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "='任务-工时'!AB12"
+                          "SerializeProperty": "='任务-工时'!V12"
                        }
                      },
                      {
@@ -875,13 +870,13 @@
                        },
                        "Value": {
                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=NOT('任务-工时'!AB12)"
+                          "SerializeProperty": "=NOT('任务-工时'!V12)"
                        }
                      }
                    ]
                  }
                ],
-                "ID": "68264236-0da5-4bd7-a4d1-c388d5f3980f"
+                "ID": "269e504e-d11d-43ee-adf8-a28380712b6a"
              }
            ]
          }
@@ -956,11 +951,11 @@
    },
    "CellStyles": {
      "0,1": 0,
-      "0,29": 1,
-      "1,29": 1,
+      "0,23": 1,
+      "1,23": 1,
      "3,2": 2,
      "3,4": 3,
-      "3,26": 4,
+      "3,20": 4,
      "4,2": 2,
      "4,3": 2,
      "4,4": 3,
@@ -978,23 +973,17 @@
      "4,16": 3,
      "4,17": 3,
      "4,18": 3,
-      "4,19": 3,
-      "4,20": 3,
-      "4,21": 3,
-      "4,22": 3,
-      "4,23": 3,
-      "4,24": 3,
      "7,2": 2,
      "7,4": 5,
-      "7,25": 6,
-      "7,26": 7,
-      "7,27": 6,
-      "7,28": 6,
-      "7,29": 6,
+      "7,19": 6,
+      "7,20": 7,
+      "7,21": 6,
+      "7,22": 6,
+      "7,23": 6,
      "8,2": 2,
-      "8,29": 6,
+      "8,23": 6,
      "9,2": 2,
-      "9,29": 6,
+      "9,23": 6,
      "10,2": 2,
      "10,3": 2,
      "10,4": 5,
@@ -1012,17 +1001,11 @@
      "10,16": 5,
      "10,17": 5,
      "10,18": 5,
-      "10,19": 5,
-      "10,20": 5,
-      "10,21": 5,
-      "10,22": 5,
-      "10,23": 5,
-      "10,24": 5,
-      "10,25": 6,
-      "10,26": 7,
-      "10,27": 7,
-      "10,28": 7,
-      "10,29": 6,
+      "10,19": 6,
+      "10,20": 7,
+      "10,21": 7,
+      "10,22": 7,
+      "10,23": 6,
      "11,2": 2,
      "11,3": 2,
      "11,4": 5,
@@ -1040,15 +1023,9 @@
      "11,16": 5,
      "11,17": 5,
      "11,18": 5,
-      "11,19": 5,
-      "11,20": 5,
-      "11,21": 5,
-      "11,22": 5,
-      "11,23": 5,
-      "11,24": 5,
-      "11,25": 6,
-      "11,26": 7,
-      "11,27": 7
+      "11,19": 6,
+      "11,20": 7,
+      "11,21": 7
    },
    "ColStyles": {
      "1": 8,
@@ -1063,14 +1040,14 @@
  "Spans": [
    "3,2,1,2",
    "7,2,1,2",
-    "3,26,1,3",
-    "7,26,1,3",
-    "7,4,1,21",
-    "3,4,1,21",
-    "8,2,1,27",
-    "9,2,1,27",
-    "11,27,1,3",
-    "0,1,1,27"
+    "3,20,1,3",
+    "7,20,1,3",
+    "7,4,1,15",
+    "3,4,1,15",
+    "8,2,1,21",
+    "9,2,1,21",
+    "11,21,1,3",
+    "0,1,1,21"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1129,7 +1106,7 @@
      "IsAutomaticStroke": false,
      "IsAutomaticFill": false,
      "Location": "24,131",
-      "Size": "911,354"
+      "Size": "741,354"
    },
    {
      "Name": "a0c55ba2-d00e-42f2-ba40-0168dedc4f0d.png",
@@ -1143,13 +1120,13 @@
      "IsAutomaticStroke": false,
      "IsAutomaticFill": false,
      "Location": "24,64",
-      "Size": "911,52"
+      "Size": "741,52"
    }
  ],
  "CustomNames": [
    {
      "Name": "折叠工时详情",
-      "Formula": "'任务-工时'!$AB$12"
+      "Formula": "'任务-工时'!$V$12"
    }
  ]
-}//aX9e2MvHTXGW42u02Z7RgBikESD3gmg6ZolN0nnw/xht53aGQ6Ou9OC5FYi1I0VSHejFBuytgroju9KmTzn4Fn2IfEqBY9+6yER701tmb35d2FGdsbvfS4XPf6j5jnTwe/G4vjZxKIsGFfR66/F8z5pwxKmI+ywCq5t6f3pPgWoyF150L8aF0NsNHfrg8pr7dr2HV6fra/aK15OW8dRD+pblzT46Ja5Zj3wRPYtABd8GbL4I1wJzj+dq/Ngn+0fO8euQYUNxLXonz38AqM8XqQEdVGUG2t5zD5E/5iPelNkAU0QPL2cXK5rRhrEoL15Am7CEMeJdnB/AsmqCxS3tDK85iGdMuKL3AEfS4xiH3gJCldhE3PsNKWSDLxIJIHdnHuBDTIovF28k4tFezRYuyUp0jV9OyL/fEQYUNcGiEdy8HKBBvQgwV8jnRHd9Lu9NcKamapoTf8uAFt2AueA7lVK+D1cAOnmitVXLf/nR8PHpk1ZKzdZnVSg2FF0NAYBPGxWNo+N9tOUBexsozix9WYKlcVQg+GrnzaxMYJVYhvlkDm6AjxxjGPMZu+N0FXfivBqqUzMDJ2dIw6nD5920LrRsev8D/IaclSsuwJu/tbAVIfeYAWumOR0O5ZEysjzI1Pu7Fpw3qPJR8/hU8wQzsIUbHVxTb0WCWOzNeMFq+HNnVEPArbvf0RtsGvUcDJo/8g5JPy2zQMitmZHbN++GC5EPjSdDHT/3+zCODWDO65WkIsw24sMpCmUWuaJPyZeSs3CxZACwhRZrWsJcRsOUyAks2OryM5TXu654k3fNxu8iNVKfwdCIPcFWJQ0cpLRB2QDnHJBpYYTP5w0XGBSqar7FNINjO3ClWrWKxF7NIJpgvGUhCaSjFGN9lRL6UJ+/sfPhOOem5NjMF8EBkMWyeQ==|920
+}//WT7yyZS+v+bYOb5xjSPSQy3PFmMaLbZhJHNN+65y0PBKNT8AGfIir3eUYaTQh8wVgVtaXjKP8aqr9Zw02FpwfeRvrP7/wwY+s8M8fe69AY0KOPloBH+qTrhlnKi0VHTl2dQ8UTe2nWkDu29rm3W5/LIueQ8+m+5sW4ioY+w23J89GyfQnA6ayep0h70ULj3kpqn0fG6U6zlNeuLlPNKl55ZmE3eOrfQwFWsuJ848S9E7qFRJFsYpN0X+caYOWTUi6oNlyfHVfg9r3OULCbZ3sjU2cvDtku0lcJpT4R8QpIrQjajdRaGUDwrXNG72oFCMmBzEw7Dqgzz5fwN2wf/3+IDLtiH6QoT5vxfw/strlCbFNEw6YL3rTtbavyAAw8JUd9PPTBHEH9ASLhd05Cd2EqztPbRlQK752BwEFkFydo7GUa1UsM444FnshnRqFBwmF7Z/uEA+fTmm2ax6iINSTs+x9O0G17+b56SFbi5LkGLOo5uB5MaAFlG383CAobIPWPHBAxhu9qFzaNPavMBvQAxItri3qW1AaRP37FSN+Rou++PeauP686lrOjZpszO0n/fqvj0jeYYLwBYzjGsb25nPvVJvGJQSIsHwhSMRHeKOJ0soTn4H/SLiTYJykkxHPZe/K/izXveccYUdm251r8gQsqDBlGWwDGak9CkHENawlKgUCnqLMYmLK05WXFa5sn9YK9HlpaV02GqtcW9I1DFhGAvJT23aAsFhLFwBL0rvmhS2SdxeP4z+tbuNndoHzjydryAdwMT/jyKBD3Tp0GQ1QRSocRnSENDOd4Prq7BAq+FaA17UZtr5lScx4xxnakQFca7KQNxAlLvLNc39Jh+2vsV59rOHfrb5C7KuwVwTUAcgwov/+8M0XoLSI3pdnDPFc/mztGiOO4Q99AaAmg==|920
--- a/Pages/任务/任务-工时.rd
+++ b/Pages/任务/任务-工时.rd
@@ -1,11 +1,11 @@
 {
  "PageType": 0,
-  "ColumnCount": 30,
+  "ColumnCount": 24,
  "RowCount": 12,
  "CustomNames": [
    {
      "Name": "折叠工时详情",
-      "Formula": "'任务-工时'!$AB$12"
+      "Formula": "'任务-工时'!$V$12"
    }
  ]
 }
--- a/Pages/任务/任务-进展.json
+++ b/Pages/任务/任务-进展.json
@@ -134,29 +134,20 @@
          "DesignLengthInPixel": 32.0
        }
      },
-      "14": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "15": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "28": {
+      "21": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 32.0
        }
      }
    },
-    "Count": 29,
+    "Count": 22,
    "DefaultSize": 32.0
  },
  "Values": {
    "0,1": "任务进展",
    "1,1": "任务进展",
-    "3,2": "新增进展"
+    "3,2": "新增进展",
+    "6,18": 1
  },
  "AttachInfos": {
    "0,1": {
@@ -188,7 +179,7 @@
        }
      }
    },
-    "0,28": {
+    "0,21": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -198,7 +189,7 @@
              {
                "TargetCells": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-进展'!Z7"
+                  "SerializeProperty": "='任务-进展'!S7"
                },
                "Value": "0"
              }
@@ -211,7 +202,7 @@
        "UseCellForeColor": true
      }
    },
-    "1,28": {
+    "1,21": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -221,7 +212,7 @@
              {
                "TargetCells": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-进展'!Z7"
+                  "SerializeProperty": "='任务-进展'!S7"
                },
                "Value": "1"
              }
@@ -347,10 +338,9 @@
        "TemplateKey": "竖排无样式"
      }
    },
-    "6,25": {
+    "6,18": {
      "CellType": {
        "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
-        "CellDefaultValue": true,
        "Caption": "折叠",
        "Style": 1,
        "CommandList": [
@@ -364,7 +354,7 @@
                },
                "Value": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "='任务-进展'!Z7"
+                  "SerializeProperty": "='任务-进展'!S7"
                }
              },
              {
@@ -374,7 +364,7 @@
                },
                "Value": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=NOT('任务-进展'!Z7)"
+                  "SerializeProperty": "=NOT('任务-进展'!S7)"
                }
              }
            ]
@@ -440,9 +430,9 @@
    },
    "CellStyles": {
      "0,1": 0,
-      "0,28": 1,
+      "0,21": 1,
      "1,1": 2,
-      "1,28": 1,
+      "1,21": 1,
      "3,2": 3,
      "3,3": 4,
      "3,4": 4,
@@ -466,13 +456,6 @@
      "5,18": 5,
      "5,19": 5,
      "5,20": 5,
-      "5,21": 5,
-      "5,22": 5,
-      "5,23": 5,
-      "5,24": 5,
-      "5,25": 5,
-      "5,26": 5,
-      "5,27": 5,
      "6,2": 5,
      "6,3": 5,
      "6,4": 5,
@@ -489,16 +472,9 @@
      "6,15": 5,
      "6,16": 5,
      "6,17": 5,
-      "6,18": 5,
-      "6,19": 5,
-      "6,20": 5,
-      "6,21": 5,
-      "6,22": 5,
-      "6,23": 5,
-      "6,24": 5,
-      "6,25": 6,
-      "6,26": 4,
-      "6,27": 4
+      "6,18": 6,
+      "6,19": 4,
+      "6,20": 4
    },
    "ColStyles": {
      "2": 7
@@ -509,9 +485,9 @@
    }
  },
  "Spans": [
-    "4,2,1,26",
-    "6,25,1,3",
-    "0,1,1,26"
+    "4,2,1,19",
+    "6,18,1,3",
+    "0,1,1,19"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -569,13 +545,13 @@
      "IsAutomaticStroke": false,
      "IsAutomaticFill": false,
      "Location": "24,64",
-      "Size": "944,316"
+      "Size": "720,316"
    }
  ],
  "CustomNames": [
    {
      "Name": "折叠任务进展",
-      "Formula": "'任务-进展'!$Z$7"
+      "Formula": "'任务-进展'!$S$7"
    }
  ]
-}//YHrlh6mUCOnuX+0yTh6iTa45PB5bXF13EDn02C9gjQocEGs3SJB+HtoxbSnJ+bdjBbP1AS+qIJhyloQhOIqys5zNZVLJcleLOCwc1z4b1IEr5C67y9rBsIxiK5KqEQTvLIhU+pi0fdi4UiIeSv+UQaBZWL0vdGCBk1+8eFtMgCjuxYwo8e/mL/WQSpND6jdNBNLB1kPJVJDrH4j0xP1tD75MVCiLXlZJSSta4RoBCu6zOTCpNor3WaRfCF7YOZ7dWIGRS2alY6U7CscSquLws7T4PPBx1SThy2/qqHlyLmwwe7DEVupcSbLzRofGoEW/n0sS3Zt/4m4JwR6Yf6uNPQ4SSu8dEAOa1l++bdHXA37w2qCIDLo9M/3RmTT2ip6X8s5mOiEqm5WF5Bkj6QclnskRMczQjlgfwzyyT8plalJx1EQ/C/GY2JBzACswum+uIYqOE3ka1BcVpD39gwXKLOvWwYnoyRPMznzXIRKxBR1tZonmWkxmXkBAkjvZ7SNZHOlzQH0ORDJzkevuVg1msi6N22YkaaKhs0eGklrgaDFHRh5xXAZ3Lb+hb9F9cdxEeMITJb8kQddC5JAEPU0X/aare9+6qY2oS3S9p2Xei4cciPzpfhD6WzmmpBrLOz21xRyT1sXBLq5/Blnv3k7EcQCAJmfSninvBVYRUsI1p1p+egpv1RtsG2IQ20+T+aTD2cZAHKYKbJO+ZKt4XCtXQhMORoZ7QWGOCCBfpTDfhapSvNgsyH8Ei77ZrPdL61RQ/uL1RAkmP+/zvsZRm3SMD11hsWUGjy+/6rl0HQ46Flc63QF+h770aU+uNKBPZd32BE0PYOcDURmxRBx/VpXK4PFOUzPF5T4/pzC6n27kuvay5tznUCYyuc8K7hgz8e/Pf897aleG8f865j1JqcL0ow==|920
+}//EqJm0NYCtGSZ8ZrFlZLK+dgq9MWOgv+vxFQNu6tq9vSoYoWjAH0fTBSOdZHIAwp2UvzbNq0Cuso0quTHOELL7J8L7TKWGFm5QZkrrb1KSsrgz7u+5mLs/j1teod4Cv/PJTiYd81p0FoG8XVf2HT3GsNv31rWbYujP9smZP0T7wUwIJP7wqMIgAZiVxmqRm9U4sU/YVH6IIpOtnf5VtOJXFATOyYOo7ONGGnHrM+YgOab2KGAjyvLAma+RQDYI4bB8IPs4XXaCYwY3345YL1PzEjYZ7JvsqbQODIoKLH9+lnMoH0lt9gRyKYBJTImAKaf4mt2zbB4CUIbAqauQ2PQ+UlyDn4DfI8qYr/gYuJWtPit2kOnRJrPuExtBv/8byeTqwgdXnnATM3g7WtEhe21Euno0nDbDWAyAGnVWNrVjSXzU3tWEm1pPrqkNFNhQ0hz24+Fo+1cAcAMcWqC6gIJ5WG+LQ2vuBZE2PBZi7r+mUBLcHdrNVEy+beaosclSgDE3m9VElXze2IsHbrp5dTEYsqp4OU+TTPhsXFx06KIprnEMCGQNiZaQkxCHSEdlzlg6QkMrbpKw7/+/aRiwpToAdLxj2XMeiE7vqa3racKNhJa0hGlXurVHdZSEo9p0gjswKroOjtHrKVAYo1sNrhsIh/BdVXHzPexMb/i0v8VgRANrWKUsKJRxcdYhlhnFP/MBdFfpG9li4m7MHxa8MYgeSLP2C2UGEE6pzd3EAhPex0Pji/Rzd9kPIY+fj8ORRWaoQh/qvyEAdP1hnoJCdorZAeiszk6EsFW1wpwzP4uX5js+dtbx+mSh7myZ8uqo6I5m9gmxMV3ay8AGZeFhACVoAyodaxfCvbaGZUS7q5tg/ityYD7RhjiuMbMW2yM6X7gxjppajP3Vds6PBIhdlBTgQ==|920
--- a/Pages/任务/任务-进展.rd
+++ b/Pages/任务/任务-进展.rd
@@ -1,11 +1,11 @@
 {
  "PageType": 0,
-  "ColumnCount": 29,
+  "ColumnCount": 22,
  "RowCount": 7,
  "CustomNames": [
    {
      "Name": "折叠任务进展",
-      "Formula": "'任务-进展'!$Z$7"
+      "Formula": "'任务-进展'!$S$7"
    }
  ]
 }
--- a/Pages/任务/任务部分.json
+++ b/Pages/任务/任务部分.json
@@ -160,22 +160,22 @@
      },
      "13": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 40.0
        }
      },
      "14": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 39.0
        }
      },
      "15": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 40.0
        }
      },
      "16": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 40.0
        }
      },
      "17": {
@@ -189,56 +189,6 @@
        }
      },
      "19": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "20": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "21": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "22": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "23": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "24": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 39.0
-        }
-      },
-      "25": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "26": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "27": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "28": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "29": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 159.0,
          "Mode": 2,
@@ -250,13 +200,13 @@
          }
        }
      },
-      "30": {
+      "20": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 24.0
        }
      }
    },
-    "Count": 31,
+    "Count": 21,
    "DefaultSize": 32.0
  },
  "Values": {
@@ -341,9 +291,9 @@
    },
    "CellStyles": {
      "0,0": 0,
-      "0,25": 0,
-      "0,29": 0,
-      "0,30": 0,
+      "0,15": 0,
+      "0,19": 0,
+      "0,20": 0,
      "1,0": 0,
      "1,1": 1,
      "1,2": 1,
@@ -357,24 +307,14 @@
      "1,10": 1,
      "1,11": 1,
      "1,12": 1,
-      "1,13": 1,
-      "1,14": 1,
+      "1,13": 2,
+      "1,14": 2,
      "1,15": 1,
-      "1,16": 1,
-      "1,17": 1,
+      "1,16": 2,
+      "1,17": 2,
      "1,18": 2,
-      "1,19": 2,
-      "1,20": 2,
-      "1,21": 2,
-      "1,22": 2,
-      "1,23": 2,
-      "1,24": 2,
-      "1,25": 1,
-      "1,26": 2,
-      "1,27": 2,
-      "1,28": 2,
-      "1,29": 1,
-      "1,30": 3,
+      "1,19": 1,
+      "1,20": 3,
      "2,0": 0,
      "2,1": 0,
      "2,2": 0,
@@ -396,16 +336,6 @@
      "2,18": 0,
      "2,19": 0,
      "2,20": 0,
-      "2,21": 0,
-      "2,22": 0,
-      "2,23": 0,
-      "2,24": 0,
-      "2,25": 0,
-      "2,26": 0,
-      "2,27": 0,
-      "2,28": 0,
-      "2,29": 0,
-      "2,30": 0,
      "3,0": 0,
      "3,1": 0,
      "3,2": 0,
@@ -419,14 +349,9 @@
      "3,10": 0,
      "3,11": 0,
      "3,12": 0,
-      "3,13": 0,
-      "3,14": 0,
      "3,15": 0,
-      "3,16": 0,
-      "3,17": 0,
-      "3,25": 0,
-      "3,29": 0,
-      "3,30": 0,
+      "3,19": 0,
+      "3,20": 0,
      "4,0": 0,
      "4,1": 1,
      "4,2": 1,
@@ -440,24 +365,14 @@
      "4,10": 1,
      "4,11": 1,
      "4,12": 1,
-      "4,13": 1,
-      "4,14": 1,
+      "4,13": 2,
+      "4,14": 2,
      "4,15": 1,
-      "4,16": 1,
-      "4,17": 1,
+      "4,16": 2,
+      "4,17": 2,
      "4,18": 2,
-      "4,19": 2,
-      "4,20": 2,
-      "4,21": 2,
-      "4,22": 2,
-      "4,23": 2,
-      "4,24": 2,
-      "4,25": 1,
-      "4,26": 2,
-      "4,27": 2,
-      "4,28": 2,
-      "4,29": 1,
-      "4,30": 3,
+      "4,19": 1,
+      "4,20": 3,
      "5,0": 0,
      "5,1": 0,
      "5,2": 0,
@@ -479,16 +394,6 @@
      "5,18": 0,
      "5,19": 0,
      "5,20": 0,
-      "5,21": 0,
-      "5,22": 0,
-      "5,23": 0,
-      "5,24": 0,
-      "5,25": 0,
-      "5,26": 0,
-      "5,27": 0,
-      "5,28": 0,
-      "5,29": 0,
-      "5,30": 0,
      "6,0": 0,
      "6,1": 0,
      "6,2": 0,
@@ -502,14 +407,9 @@
      "6,10": 0,
      "6,11": 0,
      "6,12": 0,
-      "6,13": 0,
-      "6,14": 0,
      "6,15": 0,
-      "6,16": 0,
-      "6,17": 0,
-      "6,25": 0,
-      "6,29": 0,
-      "6,30": 0,
+      "6,19": 0,
+      "6,20": 0,
      "7,0": 0,
      "7,1": 1,
      "7,2": 1,
@@ -523,24 +423,14 @@
      "7,10": 1,
      "7,11": 1,
      "7,12": 1,
-      "7,13": 1,
-      "7,14": 1,
+      "7,13": 2,
+      "7,14": 2,
      "7,15": 1,
-      "7,16": 1,
-      "7,17": 1,
+      "7,16": 2,
+      "7,17": 2,
      "7,18": 2,
-      "7,19": 2,
-      "7,20": 2,
-      "7,21": 2,
-      "7,22": 2,
-      "7,23": 2,
-      "7,24": 2,
-      "7,25": 1,
-      "7,26": 2,
-      "7,27": 2,
-      "7,28": 2,
-      "7,29": 1,
-      "7,30": 3,
+      "7,19": 1,
+      "7,20": 3,
      "8,0": 0,
      "8,1": 0,
      "8,2": 0,
@@ -562,16 +452,6 @@
      "8,18": 0,
      "8,19": 0,
      "8,20": 0,
-      "8,21": 0,
-      "8,22": 0,
-      "8,23": 0,
-      "8,24": 0,
-      "8,25": 0,
-      "8,26": 0,
-      "8,27": 0,
-      "8,28": 0,
-      "8,29": 0,
-      "8,30": 0,
      "9,0": 0,
      "9,1": 0,
      "9,2": 0,
@@ -585,14 +465,9 @@
      "9,10": 0,
      "9,11": 0,
      "9,12": 0,
-      "9,13": 0,
-      "9,14": 0,
      "9,15": 0,
-      "9,16": 0,
-      "9,17": 0,
-      "9,25": 0,
-      "9,29": 0,
-      "9,30": 0,
+      "9,19": 0,
+      "9,20": 0,
      "10,0": 0,
      "10,1": 1,
      "10,2": 1,
@@ -606,24 +481,14 @@
      "10,10": 1,
      "10,11": 1,
      "10,12": 1,
-      "10,13": 1,
-      "10,14": 1,
+      "10,13": 2,
+      "10,14": 2,
      "10,15": 1,
-      "10,16": 1,
-      "10,17": 1,
+      "10,16": 2,
+      "10,17": 2,
      "10,18": 2,
-      "10,19": 2,
-      "10,20": 2,
-      "10,21": 2,
-      "10,22": 2,
-      "10,23": 2,
-      "10,24": 2,
-      "10,25": 1,
-      "10,26": 2,
-      "10,27": 2,
-      "10,28": 2,
-      "10,29": 1,
-      "10,30": 3,
+      "10,19": 1,
+      "10,20": 3,
      "11,0": 0,
      "11,1": 0,
      "11,2": 0,
@@ -645,16 +510,6 @@
      "11,18": 0,
      "11,19": 0,
      "11,20": 0,
-      "11,21": 0,
-      "11,22": 0,
-      "11,23": 0,
-      "11,24": 0,
-      "11,25": 0,
-      "11,26": 0,
-      "11,27": 0,
-      "11,28": 0,
-      "11,29": 0,
-      "11,30": 0,
      "12,0": 0,
      "12,1": 0,
      "12,2": 0,
@@ -668,14 +523,9 @@
      "12,10": 0,
      "12,11": 0,
      "12,12": 0,
-      "12,13": 0,
-      "12,14": 0,
      "12,15": 0,
-      "12,16": 0,
-      "12,17": 0,
-      "12,25": 0,
-      "12,29": 0,
-      "12,30": 0,
+      "12,19": 0,
+      "12,20": 0,
      "13,0": 0,
      "13,1": 1,
      "13,2": 1,
@@ -689,24 +539,14 @@
      "13,10": 1,
      "13,11": 1,
      "13,12": 1,
-      "13,13": 1,
-      "13,14": 1,
+      "13,13": 2,
+      "13,14": 2,
      "13,15": 1,
-      "13,16": 1,
-      "13,17": 1,
+      "13,16": 2,
+      "13,17": 2,
      "13,18": 2,
-      "13,19": 2,
-      "13,20": 2,
-      "13,21": 2,
-      "13,22": 2,
-      "13,23": 2,
-      "13,24": 2,
-      "13,25": 1,
-      "13,26": 2,
-      "13,27": 2,
-      "13,28": 2,
-      "13,29": 1,
-      "13,30": 3,
+      "13,19": 1,
+      "13,20": 3,
      "14,0": 0,
      "14,1": 0,
      "14,2": 0,
@@ -728,16 +568,6 @@
      "14,18": 0,
      "14,19": 0,
      "14,20": 0,
-      "14,21": 0,
-      "14,22": 0,
-      "14,23": 0,
-      "14,24": 0,
-      "14,25": 0,
-      "14,26": 0,
-      "14,27": 0,
-      "14,28": 0,
-      "14,29": 0,
-      "14,30": 0,
      "15,0": 0,
      "15,1": 0,
      "15,2": 0,
@@ -751,14 +581,9 @@
      "15,10": 0,
      "15,11": 0,
      "15,12": 0,
-      "15,13": 0,
-      "15,14": 0,
      "15,15": 0,
-      "15,16": 0,
-      "15,17": 0,
-      "15,25": 0,
-      "15,29": 0,
-      "15,30": 0
+      "15,19": 0,
+      "15,20": 0
    },
    "RowStyles": {
      "0": 4,
@@ -770,17 +595,17 @@
    }
  },
  "Spans": [
-    "3,0,1,30",
-    "6,0,1,30",
-    "9,0,1,30",
-    "12,0,1,30",
-    "15,0,1,30",
-    "4,17,1,13",
-    "7,17,1,13",
-    "10,17,1,13",
-    "13,17,1,13",
-    "0,0,1,30",
-    "1,17,1,13"
+    "3,0,1,20",
+    "6,0,1,20",
+    "9,0,1,20",
+    "12,0,1,20",
+    "15,0,1,20",
+    "0,0,1,20",
+    "1,13,1,7",
+    "4,13,1,7",
+    "7,13,1,7",
+    "10,13,1,7",
+    "13,13,1,7"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -824,4 +649,4 @@
      "Formula": "任务部分!$A$1"
    }
  ]
-}//some99+seAX76Sm+UG4PG7irOT/NjPQK0FEcGdommxJSaEKgBtGYtXVgZuDf91Q790wCRLIbM2OR0F5hBOrQH+7nhgxp8a8+RqpWObtXFQ2GCPFcYDTudYtIWlh9xGY5PXXA4y2wxwd3o/XkSlSDr09dggDF80Kd2BxXd1YU6XcEmC9MBDsx9GeLLJdoUdMLxdK4sRJ4HBn7zerjhuUTLz7GgmbqTpzob4lZpFWkuoen8VD49F6q1bH+2/urozzHHaS7Bebqbmfb3OtxH7Gh1xx/9dZsarFpzxgdky4XFPeOSpiQ2ODyQXWuIcAMOJIEAihs0Ui4Nvm/HTs65OCHriQ+H/c/XR866uuLK1Eg4nMqG5i1NMNozqbBbl5PFjSJ+Ww0iCWA9vtSD59TQb5d8yvE9xe97raOo0Zo3gOlSITogg5yxn6g4My9TlT0PXbwO3H5Jtu3lauZIlqJhm3lGp0S/79UuIB33bypnOwVyiLkUoZqFSQcQYlu3XhrR1T+fF577dGlPqnIZE3jWO0DAqHugpGDd0yxuDjVQZ2qEys3o0o5dE7JIN7ydLUUEVisbJUoKSWJXB9BE6EUHTYcdHU+we5ZMRuBagEQphzN16tLwFkJyjiecHSGYgWi4/+jm18BL4Wlt5WsauDJxLITncOEdXvl8E4Z74uHdSvR4Be0LjfP8sHILA7m1Ng7/xd5wBmj9jL/NJ46skLoUbhrZAPMZKidnL/B35CxgNTqZ2VI4ePptZPyVumTVxWU3IEa+yNYm6ehTfX8HAMt/t+xwW8WHZLxlzKbBrOXX8zZWH2U35ovrOtflbH160kVKIIMAcSiljDhcGtpiXIFUMgojNi3kceE6P7Br25AEBReOFbdIqcNF1XHm4tmdzu15I/k2d/iUCODvkehYKFwCz5Hcg==|920
+}//lSDudjxOWddtNutDB8SJeGQCFwKG46gQkffVtUehLwWFAuKyt7NbK2nOOrVZWDwFBH5qobphA7vcD3nRA8nNqYdGV5TaZRQf2BYbqMJ5nigCpbFetm6JXd/Hn9Ztf3awJWuAvgz/rlW7Paiq/baQDokT8vUSuaC6mP7oyvENJSBCL3ohadpw3H7meLhVxPCSyM/PnJKE+1pp18uDy2GlXl7NKUbbyWYfTowMq2nQs7Gi6TgZmXYOOsccMoiIYRE9kIWYVKNUAqesho///yY1jFWWw+9U4gJyGCEQ97f5CiRPu8ztBAa8gSfjYOsQXl42Kg/1AutmoCCQlJUYa7Mwx53uybKTkLC9XHRxW+DbyWsUCWOQz3XK+hqbWB6o3LZxLYjRqyngP4by5VQmGxBzFzZWI977uAT+z4zD9sQp/C3zCqofDC7PijxLEts7O2RVIR4Cc+tOS/TKU9c4T9gpOI6lWP/lV6DFD/SSEMU2+dc4qBVJTmck2tvXnrqkr/yhrvBAPOuE+2n6CFGZZBpYiIi6TVBer/KvH7IwsMp3ISYXYWA3KBWNvFTDKNXA5oqThqF9lW9Zx/jPAM2vGb8RWjVSt/QcfcvWepw11WkcQDYRxIGbBa2vhBgZCE1WKUFZlMdVqxkYOsyh6d7YDTgz9LdJZgkfOpxhjva+7crkgntMTsSKULGNznwccomkGWhrd5jzNFUCCVT9JTYMCi+kcbplnX+rAja948bZ2sw6idWG8pA+soqTu5dHPyLfLmuP5M4kgEyXjclt5ttV0lHRtIOxQFtCt+BTmW5NessMi/74t5tn6ffpHvNeOMV6DchFnJ19n1EqblOx0KR4maujnEKb16NV9XxMQQurvfJULOtAElLrJHInDkCPY7aMyBts3IsWvxpLf/gC/vrEVmQdPA==|920
--- a/Pages/任务/任务部分.rd
+++ b/Pages/任务/任务部分.rd
@@ -1,6 +1,6 @@
 {
  "PageType": 0,
-  "ColumnCount": 31,
+  "ColumnCount": 21,
  "RowCount": 16,
  "CustomNames": [
    {
--- a/Pages/任务/任务首页.json
+++ b/Pages/任务/任务首页.json
@@ -38,7 +38,8 @@
      },
      "6": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 32.0,
+          "IsHidden": true
        }
      }
    },
@@ -130,12 +131,12 @@
      },
      "15": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 40.0
        }
      },
      "16": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 40.0
        }
      },
      "17": {
@@ -155,7 +156,7 @@
      },
      "20": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
+          "DesignLengthInPixel": 39.0
        }
      },
      "21": {
@@ -164,36 +165,6 @@
        }
      },
      "22": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "23": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "24": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 39.0
-        }
-      },
-      "25": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "26": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "27": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 40.0
-        }
-      },
-      "28": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 40.0,
          "Mode": 2,
@@ -205,32 +176,32 @@
          }
        }
      },
-      "29": {
+      "23": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 32.0
        }
      },
-      "30": {
+      "24": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 400.0
        }
      }
    },
-    "Count": 31,
+    "Count": 25,
    "DefaultSize": 32.0
  },
  "Values": {
-    "0,30": "任务-侧栏",
+    "0,24": "任务-侧栏",
    "3,0": "任务部分",
    "5,3": "任务ID：",
-    "5,8": "项目ID：",
-    "5,17": "参与人数：",
-    "5,23": false,
+    "5,7": "项目ID：",
+    "5,15": "参与人数：",
+    "5,19": false,
    "6,1": "工时分配方式：",
-    "6,8": "总计划工时："
+    "6,7": "总计划工时："
  },
  "AttachInfos": {
-    "0,30": {
+    "0,24": {
      "CellType": {
        "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
        "PageName": "任务-侧栏",
@@ -258,21 +229,21 @@
        "GUID": "2c5a4904-3a02-4c35-9080-be6d81c7674b"
      }
    },
-    "5,11": {
+    "5,10": {
      "BindingInfo": {
        "TableName": "项目表",
        "ColumnName": "ID",
        "GUID": "83e8051b-34cd-41da-a2b4-9699687b73bd"
      }
    },
-    "5,18": {
+    "5,16": {
      "BindingInfo": {
        "TableName": "任务表",
        "ColumnName": "参与人数",
        "GUID": "dd68b5dc-2111-47fc-92e0-c24293bc5265"
      }
    },
-    "5,23": {
+    "5,19": {
      "CellType": {
        "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
        "Caption": "收起侧栏",
@@ -284,11 +255,11 @@
              {
                "Location": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=任务首页!AE:AE"
+                  "SerializeProperty": "=任务首页!Y:Y"
                },
                "Value": {
                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=NOT(任务首页!X6)"
+                  "SerializeProperty": "=NOT(任务首页!T6)"
                }
              }
            ]
@@ -296,7 +267,7 @@
        ]
      }
    },
-    "5,26": {
+    "5,21": {
      "CellType": {
        "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
        "Caption": "折叠全部",
@@ -382,7 +353,7 @@
        }
      }
    },
-    "6,11": {
+    "6,10": {
      "BindingInfo": {
        "TableName": "任务表",
        "ColumnName": "总计划工时",
@@ -448,11 +419,6 @@
        "BorderBottom": 1,
        "BorderTop": 1
      },
-      {
-        "BorderBottom": 1,
-        "BorderTop": 1,
-        "BorderRight": 1
-      },
      {
        "FontFamily": 0
      },
@@ -493,15 +459,14 @@
      ]
    },
    "CellStyles": {
-      "0,30": 0,
+      "0,24": 0,
      "1,1": 1,
-      "1,29": 2,
-      "1,30": 3,
-      "2,30": 3,
+      "1,23": 2,
+      "1,24": 3,
+      "2,24": 3,
      "3,0": 4,
-      "3,25": 4,
-      "3,29": 4,
-      "3,30": 3,
+      "3,23": 4,
+      "3,24": 3,
      "4,0": 4,
      "4,1": 4,
      "4,2": 4,
@@ -526,67 +491,54 @@
      "4,21": 4,
      "4,22": 4,
      "4,23": 4,
-      "4,24": 4,
-      "4,25": 4,
-      "4,26": 4,
-      "4,27": 4,
-      "4,28": 4,
-      "4,29": 4,
      "5,3": 5,
      "5,4": 6,
      "5,5": 7,
      "5,6": 7,
-      "5,7": 7,
-      "5,8": 8,
-      "5,11": 9,
+      "5,7": 8,
+      "5,10": 9,
+      "5,11": 10,
      "5,12": 10,
-      "5,13": 10,
      "5,14": 11,
-      "5,16": 12,
-      "5,17": 13,
-      "5,18": 9,
-      "5,19": 10,
-      "5,20": 10,
-      "5,21": 11,
-      "5,29": 13,
-      "6,1": 14,
+      "5,15": 12,
+      "5,16": 9,
+      "5,17": 10,
+      "5,23": 12,
+      "6,1": 13,
      "6,4": 9,
      "6,5": 10,
      "6,6": 10,
-      "6,7": 11,
-      "6,8": 8,
-      "6,9": 12,
-      "6,10": 12,
-      "6,11": 15,
-      "6,16": 12,
-      "6,17": 13,
-      "6,18": 15,
-      "6,19": 15,
-      "6,20": 15,
-      "6,21": 15,
-      "6,29": 13
+      "6,7": 8,
+      "6,8": 11,
+      "6,9": 11,
+      "6,10": 14,
+      "6,14": 11,
+      "6,15": 12,
+      "6,16": 14,
+      "6,17": 14,
+      "6,23": 12
    },
    "RowStyles": {
-      "3": 16
+      "3": 15
    },
    "SheetStyle": {
      "FontFamily": 0
    }
  },
  "Spans": [
-    "5,4,1,4",
-    "5,11,1,4",
-    "5,18,1,4",
-    "1,1,1,13",
-    "3,0,1,30",
-    "0,30,4,1",
-    "5,23,1,3",
-    "5,26,1,3",
-    "6,4,1,4",
+    "5,4,1,3",
+    "5,10,1,3",
+    "5,16,1,2",
+    "1,1,1,12",
+    "3,0,1,24",
+    "0,24,4,1",
+    "5,19,1,2",
+    "5,21,1,2",
+    "6,4,1,3",
    "6,1,1,3",
-    "6,11,1,4",
-    "5,8,1,3",
-    "6,8,1,3"
+    "6,10,1,3",
+    "5,7,1,3",
+    "6,7,1,3"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -627,7 +579,7 @@
  "CustomNames": [
    {
      "Name": "参与人数",
-      "Formula": "任务首页!$S$6"
+      "Formula": "任务首页!$Q$6"
    },
    {
      "Name": "任务ID",
@@ -635,15 +587,15 @@
    },
    {
      "Name": "收起侧栏",
-      "Formula": "任务首页!$X$6"
+      "Formula": "任务首页!$T$6"
    },
    {
      "Name": "项目ID",
-      "Formula": "任务首页!$L$6"
+      "Formula": "任务首页!$K$6"
    },
    {
      "Name": "折叠全部",
-      "Formula": "任务首页!$AA$6"
+      "Formula": "任务首页!$V$6"
    },
    {
      "Name": "工时分配方式",
@@ -651,7 +603,7 @@
    },
    {
      "Name": "任务总计划工时",
-      "Formula": "任务首页!$L$7"
+      "Formula": "任务首页!$K$7"
    }
  ]
-}//9iWcTkxJ7wb3iqOy4Z7eqTreJROVl4qRJuczkE8bJYrIeCiWt23ZIag9oSCGHKBdIB1eDVWY29WSQQyj9HWlUGK/TU/z/wsRus0hbyvZZQ7wLOvc3s4+5PIT2/bsQ9Y0HLml8rXMYr5jdg/ARhFnrxmKYZOIy0SvcEyczoDf214ZlHzxPAyUUeER8BiUG0qK3MLKNcpxsSOShZX+XRyDWVgNTTeyd31MwkZTZykhU9rJVAWSaPeIzyhOq8j6Q5c4b8uBxoGfurmTbC5RqbxkkSWxV4Zc33kmmppNG9ri+KA7X6OIR3cfq8GII/1d0ibFY59wqHpVxVJZUzFCSAJWrSgaFmjWv4uaXH6jbVEkT4lBuP/A0haOU7Ft95MiUYxfDZhIjI7BHVeo8pCGqlP2F7Vi8wre3mUTSEfx3PUJZrDg0xfeTEO1WccP3HWD/atGOWu7TM++ImZCvnRB7CG3XFUWWK8CyKlH6RIS53twDe5SguLwVtR44WX1kut/GmtKBGggj9MRG59DxHrPqM2aItNRn5kMKqg+z5Xyet5wESuCo4BpWd1io4bdujNbzsTZgVspcq6iQiNtC4xuuZAGvjzNynZVq737gZD40dXHLdJN7s8EhY4EL34HeICnFEKHLQRKNOUM9t4bc9Q3e4j7F7x4fmdjJtL6jdECKLxH1Xew8NeQ2++XERL5xTJ4rvR+NGEPG5ZF036dmYIem9o6zLY5qn0YEnNVrrvdFvxbwILwh7+Tq8Ca4tXK6znWrKJ+n2r3gxIDaFPTs5DDSUDmRHPDd0csT5g5+/J/tCKrKwTNtVdEO55bZOdFOedOxZYGHvT1+muW2JVKF+wjjUgCjol7dM7BgdyaA57XHtziO4Zg/Ev6hztMx1eobY/Fl2xHNJJVr1i6HJMkZVdcrN5usQ==|920
+}//FEWyRMsH5Qa/QB774LlDuBOCTRl02zsfDOHJ6CTLDIP5qXuyEw/776vKgRL+qdcsVrup9/Aqh8puca90YblMEEXes8C8iQwP8q4L5t2+m6UgOZS1CJ/SU2wibXcmjmGkAoo1IG+M87KNjt7K4DqVuGJc6xezf+JsQ5SLbhwnxCOdimAik0//Goth3YUC28Kc07kW1tQn5Ki0ORK5UXoCyIheprzWWWN7cGfLlUtWkGmovbogtFEdReCZaqLPpvVQ6iP/oOzp7lSEzbTADiWfX57/DfsOo6dj8Kc/vPLc4AadvLJOHPGlja03OqSn6p9s2HKIkHdKeRMBpuWs1AODqN0uLcflCNTWTG7qA/MCEfboU2o+bxQ/YyLNJfelC2w161zxYnEp4Xm3/Xb2ir4CD2Ljv0Ep3OtGZHHmr+lPZHY7wzRzmsL16uGIxDzRiEgKXRUDvs/yVTvj77QqwLOWIsgyLn0joibufkSWJVsvU/P23i7dzVmgxlO1QIbU2FFtkwYIr1Xf4uCAoAMG8aPVCMUn8AkcMF8JrEq4eIvb6utvj8UPn1SMBl2mSnsYOPbx7Zydv8q9oVbPO8UGQQNWez3/GnGqNqq21Quh9Q0QLlaR0L3RpHmuncVQEtC6x9MVY87EQbyzSLAbHkaAKZBf8jeGUAUELHaA++NB10EikO9fALzLOu/nU5auQ3g6DP3CWpGq5VAPX3SEbgI9uCql2bLjT40AUHVOxy+IAv/W0gxAKFEaUEyIYW8O9R+1MDDLrW2zpzmuDDeciMZDtR6ogaOvY/J8TMVH9Ph0APO/CnEaAKs0yVMzM5K2sWFcAGLQSuRIyuAruwP2EsHZ2UeyFx7vccv0DDesQtw+a7XQ6bO21sUlflQs6dOsVbYajXaB5oWGx6JyGxYHl3y7KjEXJw==|920
--- a/Pages/任务/任务首页.rd
+++ b/Pages/任务/任务首页.rd
@@ -1,11 +1,11 @@
 {
  "PageType": 0,
-  "ColumnCount": 31,
+  "ColumnCount": 25,
  "RowCount": 7,
  "CustomNames": [
    {
      "Name": "参与人数",
-      "Formula": "任务首页!$S$6"
+      "Formula": "任务首页!$Q$6"
    },
    {
      "Name": "任务ID",
@@ -13,15 +13,15 @@
    },
    {
      "Name": "收起侧栏",
-      "Formula": "任务首页!$X$6"
+      "Formula": "任务首页!$T$6"
    },
    {
      "Name": "项目ID",
-      "Formula": "任务首页!$L$6"
+      "Formula": "任务首页!$K$6"
    },
    {
      "Name": "折叠全部",
-      "Formula": "任务首页!$AA$6"
+      "Formula": "任务首页!$V$6"
    },
    {
      "Name": "工时分配方式",
@@ -29,7 +29,7 @@
    },
    {
      "Name": "任务总计划工时",
-      "Formula": "任务首页!$L$7"
+      "Formula": "任务首页!$K$7"
    }
  ]
 }