{"Message":"修改任务工时统计视图","MessageType":2,"Modules":[{"State":1,"Type":23,"Name":"TableView/View_任务工时统计"},{"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":15,"Name":"ServerCommand/上报实际工时"},{"State":1,"Type":18,"Name":"RdlReport/工时报表"},{"State":1,"Type":15,"Name":"ServerCommand/计算报工数据"},{"State":1,"Type":15,"Name":"ServerCommand/用户登录检查"},{"State":1,"Type":31,"Name":"UserControlPage/任务统计信息"},{"State":1,"Type":1,"Name":"PCPage/TODO-FULL"},{"State":1,"Type":1,"Name":"PCPage/设置时间"},{"State":3,"Type":15,"Name":"ServerCommand/保存计划"},{"State":3,"Type":38,"Name":"Image/成员.png"}],"Version":"v1"}

2024-06-26 15:12:31 +08:00
parent bc95a3976d
commit 299fbbe810
26 changed files with 1172 additions and 1324 deletions
--- a/Pages/31a709cea02e45ad83bb92336a6d829.json
+++ b/Pages/31a709cea02e45ad83bb92336a6d829.json
@@ -224,7 +224,7 @@
                            }
                          }
                        ],
-                        "ID": "a36e1fce-5817-4a00-af5f-523836be9f88"
+                        "ID": "b252fe24-3d40-4876-b873-9a4c1cd191ae"
                      },
                      {
                        "CommandList": [
@@ -239,12 +239,12 @@
                            "BtnText": "知道了"
                          }
                        ],
-                        "ID": "2333ca78-df42-42ce-bf40-90f0a7789229"
+                        "ID": "454a74d9-ba2f-4408-9698-f2dd39d37e3a"
                      }
                    ]
                  }
                ],
-                "ID": "39e17237-aea8-4c2f-bd3b-eee3aeb8b802"
+                "ID": "69ac83b2-27f6-4055-b884-3cbe42df6509"
              }
            ]
          }
@@ -366,7 +366,7 @@
                                  "value": "编辑"
                                },
                                "CommandList": [],
-                                "ID": "0f5594a0-f0d2-491a-9a75-4998cd1699ed"
+                                "ID": "f25c1d8e-4c3e-467e-9b4d-8335eda2de64"
                              },
                              {
                                "Condition": {
@@ -420,17 +420,17 @@
                                    }
                                  }
                                ],
-                                "ID": "e0ce0792-645e-44d0-b756-10cf457717b9"
+                                "ID": "2d7f3381-2de1-4839-ae84-fd862a9a05c7"
                              }
                            ]
                          }
                        ],
-                        "ID": "52a81c5f-5888-4701-8cf2-9ca31333fc5b"
+                        "ID": "e8a1accf-755d-4754-ae86-68086fa1f6ff"
                      }
                    ]
                  }
                ],
-                "ID": "12195392-5e2a-4c5f-9371-1246356c1d60"
+                "ID": "5e46fac2-6bb7-4bf5-b583-2043eb199198"
              }
            ]
          }
@@ -550,4 +550,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//jH0noZDmjaprTj7ftmQB5nNSpbLcq5qbjCJMq6YF60ToL4i4LOE2lhC9+3mQLQJZvgup9VjlcO/fXpljg5bxr54bIGlMbuV7BEWQ5gU1x4hacO81FIaZWgTRTA3lcY2N2YOgxHB25zhb5IhYMpmbONUm3FxjudMdNe5qFUgIMNBFIUv4ggIF+PS//ncW75Fz41pvGD/5DG1QRCDWbd6H2qgIB3jEZgF6U1rd4xnavEEpgbo0K69x7fgm0b17Gz2d73e6oLNvn/ahmFuJkzUAwZCdwIwZssPG0qf1V8bVXn6QkZYJco00c0PpMQ6mL0lLiVLSSnhBaNJJqt6ls4aWCKlsyrS3iF9DSphG0RUKa9zcEbIOIe04WIF3HjHv3FMnF7I69s2znUuO8nDjNchTvHPQQMHeGMN5JjB2f7F/5J4iT8+pYHtOJSE4ni9/cCfDpx+TISKpSckCu/HIPWLV3x/NOsxYsM9hB64KTOOfEbqjnePFlodr76QtkJ6IJjAeRWCSVpODZ51SgVQe9Wb7dMKaBjpE/uRY0ex+XebM2BWdpidAC2x5Mjy3i7WNMUTRuuCdVz16mtMzcbDoeBGSN0n/7QcmetxAk3DHqU1yI202dZVz6+dgX7UnaEfLm5nT3HIsXOHgO4h8tS8eABKiobBqSdH6toZ5tUYGOQSZ/AW1Rqmn+ezvpgGXAydrEa8Cak05NSo1V/OBW8RS2hvuv/0njlDDOl+dxGLGkNeoyWFNQUFpRjV1ZnfFi4wPZewsuckN89nG8PxT/A1n3zE+5qmVHG7Y//LlryxV98Wb7ky9wwozgMmLkAfo8iAr6uqYJblWsu8DPBuoAk1G+vbbcpu6MJjLti3UXe9RSknT8v0Lp2pZDnRNwzPrlOA+KtJsPl2pTnU6sDZAJFvKNd6DZg==|920
+}//+0BgRdj0bIOXKeAs1/0mkV05OzkJlYte1y4b9mBV9iEA0eXY2LKc5tTtEM7QBXbh8CGR8MbTWI6huvzR0188DFcUPNjW3b8aMwOvPGDRW9JmYG4eJscUw+JMnX1+8rrFGfTysFSJpsEmF/idbElcs9yYEBbCSpHbN5k3b1fpgelYnKxx1rY5sK6dqsWQN1S/CnE/70j2HKtwUzjqpstVjLvJUPmM5Gu3HtMbG5MjSk9/yCvdvr5GJVtCusCpWyRSaaPYLpRH7z5lon0gJIRXJEWLQuDIBjjJTI0fLWnKuJ8wSGlZ+lqWAGVkgwecJAv6Nq9Wh8UmpJZ0zjHyNfPRBTARM6crmokV1SO2hKvg3wWwWlPnYkyPsdjtPJHDVqIGGOmY9T9A57knJuRe4PTwRFUFFrwod8oFlq/Uczbe3/uc1yrLcDBwE3bLNA3E93hYFe1FAbyRdYnXFSK7Vv3CVbDUGakcK+Eylecmn0g64+/IoHeh2urXT3A6DvoUTyN5oNXsHXTcWZYNO4c4V0k4p46a0NuFyfGVGX4fa0Y7eYJQhDsBM1TFE1miKBZMktIOu2GFlRBGY1RwtEb4AkNNU8lDUsnWnQ4h2HalrxtCtqjRHpS8urUxWQ7feIWx0X6PuI7dVOWC7sIhEeeSLXtyou11GYNtkl/TA/uiR45e8NtlUH30cFEAyPodYp4RskCyC2fn70VT8mJ7+krIl4850nOLt+zdEaR5mWrG5m4gTHoHaPSUHQ7joBXpbA5kZrOhGv+YDcxucLiVmls0V5Xcwfckgwmk3v3NY1PSq4y+pK7sFcxeQyEr+lHKGqi34YVvLYA1fTtt0lc2ow6/tDOMdezx2hQ0+QjzI5lttFo2EQ9p/0p3On8L84Z97wuc7E8BHjMIMx63r+jS6/zJP4wqyg==|920
--- a/Pages/6746a656596b44bb908448c6ffc1502.json
+++ b/Pages/6746a656596b44bb908448c6ffc1502.json
@@ -35,7 +35,8 @@
      },
      "6": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
+          "DesignLengthInPixel": 20.0,
+          "IsHidden": true
        }
      }
    },
@@ -72,54 +73,11 @@
    },
    "Count": 5
  },
-  "Values": {
-    "1,2": "内容"
-  },
  "AttachInfos": {
    "1,0": {
      "CellType": {
        "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
-        "Style": 1,
-        "CommandList": [
-          {
-            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-            "ConditionAndCommandPairList": [
-              {
-                "Condition": {
-                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                  "param": {
-                    "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon",
-                    "contextProperty": {
-                      "Display": "值变更原因"
-                    }
-                  },
-                  "value": "userInput"
-                },
-                "CommandList": [
-                  {
-                    "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
-                    "TableName": "TODO",
-                    "ShowConfirm": false,
-                    "UpdateBindingValues": [
-                      {
-                        "BindingInfo": {
-                          "TableName": "TODO",
-                          "ColumnName": "完成",
-                          "GUID": "d8308a4a-ad80-4d33-b6a1-aa56988eab24"
-                        },
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "='6746a656596b44bb908448c6ffc1502'!A2"
-                        }
-                      }
-                    ]
-                  }
-                ],
-                "ID": "720cffa3-f5f1-4706-aeba-6d4fb5c65d91"
-              }
-            ]
-          }
-        ]
+        "Style": 1
      },
      "TemplateCellSource": "完成",
      "RulesGuidList": [
@@ -129,48 +87,10 @@
    "1,2": {
      "CellType": {
        "$type": "Forguncy.MultilineTextBox, ServerDesignerCommon",
-        "CellDefaultValue": "内容",
-        "TemplateKey": "隐形输入框",
-        "CommandList": [
-          {
-            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-            "ConditionAndCommandPairList": [
-              {
-                "Condition": {
-                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                  "param": {
-                    "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon",
-                    "contextProperty": {
-                      "Display": "值变更原因"
-                    }
-                  },
-                  "value": "userInput"
-                },
-                "CommandList": [
-                  {
-                    "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
-                    "TableName": "TODO",
-                    "ShowConfirm": false,
-                    "UpdateBindingValues": [
-                      {
-                        "BindingInfo": {
-                          "TableName": "TODO",
-                          "ColumnName": "内容",
-                          "GUID": "15fd131f-ff02-4cb3-84d2-f83bb51717b7"
-                        },
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "='6746a656596b44bb908448c6ffc1502'!C2"
-                        }
-                      }
-                    ]
-                  }
-                ],
-                "ID": "b353c7f3-4d7f-4cde-87da-cfdd028621ae"
-              }
-            ]
-          }
-        ]
+        "TemplateKey": "隐形输入框"
+      },
+      "DataValidationInfo": {
+        "IgnoreBlank": false
      },
      "TemplateCellSource": "内容",
      "RulesGuidList": [
@@ -248,7 +168,7 @@
                                  "LoadBindingDataOption": 1
                                }
                              ],
-                              "ID": "43d449fb-45ae-4b07-97fd-6ef31345d520"
+                              "ID": "4b45c4f8-7683-4514-b436-9af52bf65252"
                            },
                            {
                              "Condition": {
@@ -280,7 +200,7 @@
                                  ]
                                }
                              ],
-                              "ID": "8996423b-c198-4d3d-adbd-566658156ded"
+                              "ID": "0344ebf4-7c94-4eec-a45f-192be6477f13"
                            },
                            {
                              "Condition": {
@@ -312,12 +232,12 @@
                                  "MethodName": "ExecuteCommand"
                                }
                              ],
-                              "ID": "5213302b-5fba-4397-ba30-da7bff81ba13"
+                              "ID": "6424561e-113c-406e-9fd1-b481e89d4ff4"
                            }
                          ]
                        }
                      ],
-                      "ID": "4a51b915-96c5-4059-9681-06f9e7a5dbb3"
+                      "ID": "0f341561-a0af-49d6-90e0-ef0d16dbe0b7"
                    }
                  ]
                }
@@ -338,6 +258,9 @@
    },
    "4,2": {
      "TemplateCellSource": "时间描述"
+    },
+    "6,2": {
+      "TemplateCellSource": "ID"
    }
  },
  "StyleDatas": {
@@ -434,4 +357,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//M9RvBKLrtl7b+v9jZNuEBQ2LqjtOfFE1Z2loZTROroKBhDrBxdgF8TzbGSuqYrORS7+xk2muNYbGTWPNBdEgvTq5Xwq3JFCIwgyOJsR8FdImJrEZ2EH94rjcKLTNZfo/G5JInJi0s0bNbDnG7jhApvGEQAtEn/BE7i6Z0kyEHbiwsa/yRCiif5rCFr/0YzIUSAQUV6WRGAEuXvL5HTB6qHku0f8ySj0qTBH7WnRWTxF2exftGZpc+S5+N/OWVh2mTw4x16yKrIws3H6s773cGhqYKLSp7uDpqZtuis1JAQqs2e1kGpT/g9bh1BJYUIUVNXHSFqiBu4hLv8Cezms6izkvkSPC0ytWDmkUWT7nZC20Gh/G775sPpET8eqp537X/Ekoc+dsC7NfT5S1ccAuWAxacrwtYyfvV7Qgf5wsoDinbPVrh+4G7c3k47HIss5wdpDEPr6M5MhoJvMSGkQuwYMyPW6a0Q8oKM/X6Bw4qoBtrA+G31TcEdbJfhMgMW2RTies/2wAgutQVNRHT8P3Yfh4u2pCQlBf343ypuqJVKDnUf0P26BNNRhtEd0rvWTHH5LWzCqeW41u7Jhlt65qH2ylQDMl+OlrNb4/NlY8BmKf3R7zCwtMPU2Jz3KTj4JheZ028LcKTeuaEOyzs/VtsNTurvKCccknDaywZZ61cTPKBREs1mQmdGPK2euYLaeYhv37c/agakSqJo0OH3ECKU3dSOrL1pGwdRO44irSNvhF0zNFHbFQ0yFf0So5LOD2YTiukuOQs2SasJGeyFew3VWlopvNwT4mU8+msbym5x1oRRviFudDwMnyqfBJ3hMl6om0RUvpUG2ZWeUcCriaW53DIdmYCYiu9Pzedf1SWpcNPpXYwKr2iOAs4cJOGjEOdSWrXYtHny97M9W6wx5Z/A==|920
+}//mR/iIQv6dkoWxHdBCu/3kWXxgjs2AVYqT2IxTQl/jflrmegTSG2EdVG14vwR3WpmHiFuhrDSzAhOSC7shaQHoMF78BZT6voa+0GzjG43LRcF7Ej4zDXlRXCbV5uVpr7fI5GTiCGRfI+21albzMLnzmqqiv6Z020/ITjWYu3S5MFKoLs2mtVVuLYZqYJDjVflM/mUD/5PAiu8tHJdmIWdCYIywRh6nC61Msrjo10aiopmRCroW7Lovu+ju3z4LeaolrWVmqI9rGzfgtjyQspoSDSqAx1C+QkMC96RydsWLAfsN8uvadqWrNPEIdoKJArEIWwQW6sTToHYTfRs7x4utUOng5U+7i0+cC2sNbRjiT6g8dVCso8KA1DaIYmUYHmdpPhHlVIACSvVrxSLlCJyMYaOEILH/sy2nVLCMOevUt9LwutN3x+MHha87d9QZrMwlmEo59VpgCogb7/p4FEu9wWDY1tFoSfsPfzHBkyKEjqSbkHEHJpO/xMdqznkddSHeLX8KRmtLV/NHmXfKfOYUZCKI2l8YN1b+fPMOD7DhAOdsUKx7eh2hhOmW0R4/Wcs3iiFLkH5wjS5+ZuYweyoecDoBvzQG7KxbFLPZQgjx1EW9ZCjEny+l/AZEnh8JYual6Pzk0ySjcpLSl0rsmuokApJb3RtjUxbuBiJXKMVkOLQb8BZ/9h2kqmsOI1dVxpwkGDWmJ168PYQGchd7d+vPsLWBHpZbw9JemF8l3yL4DKB0U9nQUXQrAL9oMSNONxroMcG7U7FonCsJlHw4OxxzHIIQQT5s5e+z7BVI06a2/1OD6cOtwIYqUHZ8gGXiG5z8DyjHxzizxuweZpB+2rjjhK5P6qKFi9gL2s6H3Loci6/u5RoiuwZi4OJ1Q67rWQNgYNSFsV9XM5rZPrMrPM4Ig==|920
--- a/Pages/TODO/TODO-FULL.json
+++ b/Pages/TODO/TODO-FULL.json
@@ -260,6 +260,7 @@
    "1,19": 0,
    "6,1": "我的列表",
    "13,1": 0,
+    "13,15": "重载表格",
    "14,1": "%CurrentUser.UserName%"
  },
  "Formulas": {
@@ -444,6 +445,13 @@
                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                        "SerializeProperty": "=TODAY()"
                      }
+                    },
+                    {
+                      "TargetCells": {
+                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                        "SerializeProperty": "='TODO-FULL'!大于日期"
+                      },
+                      "Value": "%Null%"
                    }
                  ]
                }
@@ -501,8 +509,14 @@
                      "TargetCells": {
                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                        "SerializeProperty": "='TODO-FULL'!筛选日期"
+                      }
+                    },
+                    {
+                      "TargetCells": {
+                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                        "SerializeProperty": "='TODO-FULL'!大于日期"
                      },
-                      "Value": "%Null%"
+                      "Value": "0"
                    }
                  ]
                }
@@ -627,6 +641,19 @@
                  "SerializeProperty": "='TODO-FULL'!筛选日期"
                }
              },
+              {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "CompareType": 2,
+                "ColumnBindingInfo": {
+                  "TableName": "TODO",
+                  "ColumnName": "提醒日期",
+                  "GUID": "620bee2f-872b-40fe-bd95-667a963ce7f7"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "='TODO-FULL'!大于日期"
+                }
+              },
              {
                "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
                "CompareType": 6,
@@ -666,7 +693,7 @@
          "IsListviewDataSource": true,
          "CustomColumns": []
        },
-        "DataSourceListviewName": "图文列表表格2",
+        "DataSourceListviewName": "计划表格",
        "TemplateKey": "竖排横线分割"
      }
    },
@@ -689,12 +716,20 @@
                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                    "SerializeProperty": "='TODO-FULL'!分类名称"
                  }
+                },
+                {
+                  "TargetCells": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "='TODO-FULL'!筛选日期,'TODO-FULL'!大于日期"
+                  },
+                  "Value": "%Null%"
                }
              ]
            }
          ],
          "ParamProperties": {
            "ID": "ID",
+            "用户": "用户",
            "分类名称": "分类名称",
            "统计数量": "统计数量"
          }
@@ -765,7 +800,7 @@
          "IsListviewDataSource": true,
          "CustomColumns": []
        },
-        "DataSourceListviewName": "图文列表表格1",
+        "DataSourceListviewName": "分类表格",
        "NoItemSetting": {
          "ImageForNoItem": {
            "Name": "无数据插画.png"
@@ -921,7 +956,7 @@
        "CommandList": [
          {
            "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon",
-            "ListviewName": "图文列表表格1",
+            "ListviewName": "分类表格",
            "UpdateType": 6,
            "UpdateListviewCommandRunTimeMethodSetting": {
              "MethodName": "Reload",
@@ -936,13 +971,13 @@
        "TemplateKey": "_RS_Main1"
      }
    },
-    "14,4": {
+    "13,15": {
      "CellType": {
        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
        "CommandList": [
          {
            "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon",
-            "ListviewName": "图文列表表格2",
+            "ListviewName": "计划表格",
            "UpdateType": 6,
            "UpdateListviewCommandRunTimeMethodSetting": {
              "MethodName": "Reload",
@@ -954,7 +989,8 @@
            }
          }
        ],
-        "TemplateKey": "_RS_Main1"
+        "Text": "重载表格",
+        "TemplateKey": "_RS_Success2"
      }
    }
  },
@@ -987,7 +1023,18 @@
        "Foreground": 4
      },
      {
-        "Foreground": 5
+        "Background": null,
+        "FontFamily": 2,
+        "Foreground": null,
+        "Formatter": 5
+      },
+      {
+        "Background": 6,
+        "FontFamily": 2,
+        "Foreground": 7
+      },
+      {
+        "Foreground": 7
      },
      {
        "Background": 6
@@ -1000,8 +1047,9 @@
        "Body",
        "Center",
        "Background 1 0",
-        "black",
-        "Background 2 0"
+        "[AUTO]General",
+        "Background 2 0",
+        "black"
      ],
      "Borders": [
        {
@@ -1066,25 +1114,28 @@
      "12,19": 3,
      "13,1": 5,
      "13,10": 0,
+      "13,15": 8,
+      "13,16": 9,
+      "13,17": 9,
      "14,10": 0
    },
    "RowStyles": {
-      "12": 8,
-      "13": 8,
-      "14": 8
+      "12": 10,
+      "13": 10,
+      "14": 10
    },
    "ColStyles": {
-      "0": 9,
-      "1": 9,
-      "2": 9,
-      "3": 9,
-      "4": 9,
-      "5": 9,
-      "6": 9,
-      "7": 9,
-      "8": 9,
-      "9": 9,
-      "10": 9
+      "0": 11,
+      "1": 11,
+      "2": 11,
+      "3": 11,
+      "4": 11,
+      "5": 11,
+      "6": 11,
+      "7": 11,
+      "8": 11,
+      "9": 11,
+      "10": 11
    },
    "SheetStyle": {
      "FontFamily": 2
@@ -1106,10 +1157,11 @@
    "14,1,1,2",
    "12,3,1,4",
    "8,1,3,9",
-    "14,4,1,3",
    "14,7,1,3",
    "13,12,1,3",
-    "10,29,1,2"
+    "10,29,1,2",
+    "13,15,1,3",
+    "14,4,1,3"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1199,7 +1251,7 @@
    },
    {
      "Name": "重新加载表格",
-      "Formula": "'TODO-FULL'!$E$15"
+      "Formula": "'TODO-FULL'!$P$14"
    },
    {
      "Name": "筛选日期",
@@ -1208,6 +1260,18 @@
    {
      "Name": "重载列表",
      "Formula": "'TODO-FULL'!$M$14"
+    },
+    {
+      "Name": "列表容器",
+      "Formula": "'TODO-FULL'!$M$5"
+    },
+    {
+      "Name": "分类容器",
+      "Formula": "'TODO-FULL'!$B$9"
+    },
+    {
+      "Name": "大于日期",
+      "Formula": "'TODO-FULL'!$E$15"
    }
  ]
-}//qp9DsFP4laPqinyPwsNIXNVSCIRyudp2HcDH+UzOVuL+VVQVTJHBwpxDvyS56IKiCoUTPkEnmG2lH8veLY9cUuiutdqbnqq9ztH/W00TRYpWAxMpeUp1iFGGyp5eEAPP4kXdd7arbBCVPcL8ziKly3MbNAvruyt7gk5+WZRF9+n43qzqP+I6g2/eyNRJ90BsBeofZ7b3nKnuMPpvFejtn4ixuo7wXj0jkx3pWmCME08eHTZXjBdu+6FemjPPtfCI1E5spJyo1uJu1ZdXHvWRtP2uadCf2AC4VF35C/ATlGopy4jU3ucfMfxeRGAaJvCIyeAxHii7XI4/yTaEEyWDLjR3D4jon4tBQ8cN3NeLlp4WZubXrGbNK8Ju711b1hP+JDvxa9ChtXoxgzBWA3tTu2oCThQkPE5kKHkA43ADWBvBOhvHY+ORyKKsAlhuyrydOa9piXybWuIg4nTXhOL6Ls65zF8S9U84Bz2u54oOEeqW+KXWQvSREg5tkIdDMVOoaD0LJIv2j8r9V3knlJtVHtc8Y/qbTR8/KU+RtLQpUHho5bx/GdGODt9P001YibFXpzX3nf0ykPaH0aN4EesRRxPArdjr/xsu08sTA9ATAUJb0wjya3M3wFDPWKXnRUDziezi8Wfcx6BLqVSqzo0pnvRuhObJcjc2eIrvVuiHJomtQuz3vKTWic8gmEXUQbrH3zaPbhiHXJsrqMLKdX9bWEXX3ilTXvAOI+mqOWeDvo33kRgUylmB/vG6xRdnuIJOLinntL+/T8neMbISae0a6VhBZugNZxUfsqRTwvl7pCU2xwIQ4yEjUPoGKehihlSuF1TLhLicX/rQcmgNDojezzgt5mbthUX4Yup+cxXI60sjryQm05SMGL7q9s5TCy5+JZJRjz3JAy6qqwpmhRxOBQ==|920
+}//iVb0M+7xy7XJiDA4vH57NaCI/VztEwSx5RUdQTYAcI4vwSWqg7HeNJ5I1fadphUrbz3OVaoZe6LSVs+w9YSpIHoz80mTIfqs1fTeT26AQDDVb4dok0g/QQXcHIeskJPS/kk1a75c2QkmbcJnA/dHjCjYm4Z0gxJkCeECf9PxZ3QdcsFAeImqSFoZmxBpt0zh/ggRu46MIqm7KfMQP1+uphyrFbzsDh8+tLGKKeUVJcrv1OSWvCVGVOPS3yePVPAlE0cbF41xkoRtEdsyNzM+Lee/G6Dd3iU5qdvJL1xR6C+Lz+z8ilvTTgmcEV9PsRJ6lHLOqwfPtYc/ZhgpU0B0BB7Wkh69Gg3sf39K+f8GQYH0w8A1y9OUhVkOhtb6rY4GbRt+bV4SbKDGkS6kQaxFbQt3SBrYCZRBOxjPkR6ICUpE/cAppiIgkISbMAOfSSxXHGVN08RyDExeJYktuEDsaXjVN6I4et16XypYsVrxfIj9WGfzZDNKlMSa/ESx7OJWQXO0fVrOZEO7uqmWPRr/hOPgsGrGin6jYfeh9BwPxbx1diuqMF2zfL9lHVJBvOzF25VYz+bkZB+xec3yeEcRzUR9Sv+4v69e/uWhhySXoT4h7qtLhRgiYhOhgnDq/nISW49mUGm1ZCsVshnSDRVGQ8JCz7699K8SPTrS7UPiGGV/ZPL/jc6zlU85B30z0hPfDppz1bFBXU/LKar3qZXKLskqab9SH2RhOolAWtAPXL+9wqTTsamdi7a90jhfgbay/tGgosY5iM691KHBWisg6NDGJGQtQhR2JPGtWjZk/G3wF2qfDBewIJTKP2K9r5HceEm5RWUfPV1awm74AwhkKz0HQzPqZM3BZJGAKqpLGQC0ifKoLMI5ygyGCWgd7fiQ92Fw6JCxcS5+7XTjO3YYMg==|920
--- a/Pages/TODO/TODO-FULL.rd
+++ b/Pages/TODO/TODO-FULL.rd
@@ -38,7 +38,7 @@
    },
    {
      "Name": "重新加载表格",
-      "Formula": "'TODO-FULL'!$E$15"
+      "Formula": "'TODO-FULL'!$P$14"
    },
    {
      "Name": "筛选日期",
@@ -47,6 +47,18 @@
    {
      "Name": "重载列表",
      "Formula": "'TODO-FULL'!$M$14"
+    },
+    {
+      "Name": "列表容器",
+      "Formula": "'TODO-FULL'!$M$5"
+    },
+    {
+      "Name": "分类容器",
+      "Formula": "'TODO-FULL'!$B$9"
+    },
+    {
+      "Name": "大于日期",
+      "Formula": "'TODO-FULL'!$E$15"
    }
  ]
 }
--- a/Pages/TODO/设置时间.json
+++ b/Pages/TODO/设置时间.json
@@ -165,7 +165,8 @@
                              }
                            ]
                          },
-                          "value": "%Null%"
+                          "value": "%Null%",
+                          "compareType": 1
                        },
                        "CommandList": [
                          {
@@ -181,12 +182,12 @@
                            ]
                          }
                        ],
-                        "ID": "a352c644-db7f-4af6-b659-cf650cdc44da"
+                        "ID": "a302857f-eb6c-4c97-8a05-a9b6cffdd733"
                      }
                    ]
                  }
                ],
-                "ID": "8e8d03da-50fc-48df-af32-6e1650805c9b"
+                "ID": "074bc97f-dcfc-450b-94a1-7c293d3ab91e"
              }
            ]
          }
@@ -218,7 +219,8 @@
        "firstDayOfWeek": 1,
        "clearable": true,
        "DefautWeekFormat": "yyyy 第 WW 周"
-      }
+      },
+      "DataValidationInfo": {}
    },
    "5,1": {
      "BindingInfo": {
@@ -269,7 +271,8 @@
          "loadingText": "加载中"
        },
        "noMatchText": "无匹配数据"
-      }
+      },
+      "DataValidationInfo": {}
    },
    "7,1": {
      "CellType": {
@@ -351,4 +354,4 @@
      "Formula": "设置时间!$B$10"
    }
  ]
-}//R1h6jFmm5hJQVLAJZ1p1FWedwon90aWgUnalanm+UcJGmV+GNWzRSVP8pw75VnvGTggRr0IkEPPGqgPrYFQaUW5oNdEdSQq31/EH70uFfd3z+EYU7sNcDoYinTzIpoM/AynFzJMf4EiQptK8SDX7tcbd4IKlbJByWBuGC3o4rmDTtt9SDYVVq4/1svuz8x9sjg0FC0ZNTJzptHBtOwSTH+3P2tW0IAj81Jz03nWpKj17lxi1tio/5ze3AAKPRtp34GUNpxRcrsF2qngw0zlBpCttfK0QG9y9uKxkJM98OX9ZcV/CYrusTLzf7HrnS2kWx+SGGzzDxft8JjE+zYdM1ahyPrd0nTIJqjkS/ifIaWkRE1Ov7arUMczpot3wv1IdldZQ6ecVVwmwHuXwYx9N3l6h3IkT/ZcV4OKL3gSR674kCLKGq7EygnpotC6LLvAS7O68qj/RZ3YMle3Ys6El7k9NfOI6a0f2OkesXrDYNV8x1zO4bowLWGS+e8GGb4EupGYLn9w7W3wOjnnITA1NKpLgjI2pn5hLUYZ83Q7N7SBwKF4nlIL4Qyk+IP+WbO4vnmujHmpoKCYfjUKtTstGHraJAEzZcdn54a2o7R1HWI/ZWnApdZ/5vRAREbWZECbqeCjYI8dUyBmviS4S47k6V54mlHMqsw1YI0r8iWBFPcAxrxILlRmvMLJjLewkZ4X2wcAHteS8VdhzgDlI/a/nyTIXTU+Gw6kUsT722pRGMYQT2iWhlJ6qXjns47wE2vsIaBFV0rLEokGXcMfT9oqd3ssOPkiDRuOIw93sZg3FjIHGfX+hDw0xo6eAl1XLhM21nJ4Z3Ot5ZM9gJh4bCWMepWRP3deh3sO36RiCK1Wx0nwNiYMsB4T1ghTz+wt1XwQcLJI2jfx1sxbXez/lOjPhIw==|920
+}//i82l2mhqcpboreUzVMcO11sUIRBcNmTeszz5moDKnPVVt+HaIUAwGtexJYI+KbutVOE9TAqUwwjks4iUZxeYLBnIx+FQbpP0JlxRqP2NAklGT714iHBfaUwLRuocIHO5e/wfxfWp5rtgS8/SbS11IrwDUw3BglFXkUyqlNyMzZ+coaDE2TXxUOvsWS32+To4XqADtUMfwwXWn5WHa+c9w7Nr30sj0t6ulQM+e+sZBTAHJjBlSTHG6Z4WbwmORYsBzJ9/mnvAG13tpv/zFbu9+PiMEy+hK2Nx/nOHTr+Y3HQhpUyjrdlJrGaiIIkIy+7M8ue+pkohShJVM4rOMhhHYLfeMFM7KgdVBMaoqURqkCqkqyyCwDRw2aEUzveMtIxoGKPutd4P3BsAtix6RP19jaq430m4al1DmVuvxuI6v0Ps3xZ5Szk/UmrLMJtVh1yjnKXbj74QS0dH3BBUFsPsJz5CkOk1MW4LFxiIN477X3Z/kNUfZ3567MpeKi4Qu5MVSyHWEoZT8Xf1Hmbu9lt+RrMpW/MfI0xZTrHJjwDYjXoqV1bW1KV0ZIoPXi0OswvAW6aco6DKgnpkedMhie/4tAQ6hLNZxVx5XkjEQKwCLQJh0R7iUHCMZZW3FXeuFP+O2mh250w3j1ZPpTpObqZIw12EpVSZteH4mneiA/w1veO4J2PrQvj3EiiEkFZVKhvm0lWmuomFypamknx4jrXUdIw0kjk/TkIp9UFiYb9gEIes5z/wigeFNDlD2QAzYAEyPLxLq5CTfOY8g9giR1NaEvd00ZFe6IiZ5xx5xcfnWRIOJjrtEebgBNGY+JnBcIPOlIVrUJWSa6JcJd5T5arxsqKH9aqr20UJVxl9J4olK3jiYAiG+xzeyu9j9l/EypK18I5Jths39FOkeYO8ZV482A==|920
--- a/Pages/c273b140d3b24036903f81cf5f56c0f.json
+++ b/Pages/c273b140d3b24036903f81cf5f56c0f.json
@@ -18,7 +18,8 @@
      },
      "3": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
+          "DesignLengthInPixel": 20.0,
+          "IsHidden": true
        }
      }
    },
@@ -77,7 +78,6 @@
    "DefaultSize": 12.0
  },
  "Values": {
-    "1,3": "新建列表",
    "1,5": 0,
    "3,4": "%CurrentUser.UserName%"
  },
@@ -91,12 +91,12 @@
    "1,3": {
      "CellType": {
        "$type": "Forguncy.TextCellType, ServerDesignerCommon",
-        "CellDefaultValue": "新建列表",
        "SavedValidators": [
          {
            "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
          }
        ],
+        "WaterMark": "新建列表...",
        "CommandList": [
          {
            "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
@@ -114,6 +114,14 @@
        ],
        "ReadOnly": true
      },
+      "DataValidationInfo": {
+        "NumberType": 7,
+        "FirstParamValue": {
+          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+          "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D2<>\"系统通知\""
+        },
+        "ErrorMessage": "分类名称必填，且不能为系统内置名称"
+      },
      "TemplateCellSource": "分类名称",
      "RulesGuidList": [
        "988ac8ee-1e7a-4933-96c1-ff79830e77d4"
@@ -125,30 +133,31 @@
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
          {
-            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-            "PopupDisplayMode": 1,
-            "Placement": {
-              "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!E2"
-            },
-            "ClosePopupCallbackCommand": {
-              "Commands": [
-                {
-                  "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-                  "ConditionAndCommandPairList": [
-                    {
-                      "Condition": {
-                        "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                        "param": {
-                          "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
-                          "cellLocations": [
-                            {
-                              "SerializeProperty": "=是否为确定"
-                            }
-                          ]
-                        },
-                        "value": "1"
-                      },
-                      "CommandList": [
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                    "cellLocations": [
+                      {
+                        "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D2"
+                      }
+                    ]
+                  },
+                  "value": "系统通知",
+                  "compareType": 1
+                },
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+                    "PopupDisplayMode": 1,
+                    "Placement": {
+                      "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!E2"
+                    },
+                    "ClosePopupCallbackCommand": {
+                      "Commands": [
                        {
                          "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
                          "ConditionAndCommandPairList": [
@@ -159,104 +168,136 @@
                                  "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
                                  "cellLocations": [
                                    {
-                                      "SerializeProperty": "=选择项"
+                                      "SerializeProperty": "=是否为确定"
                                    }
                                  ]
                                },
-                                "value": "重命名"
+                                "value": "1"
                              },
                              "CommandList": [
                                {
-                                  "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
-                                  "PropertyItemsList": [
+                                  "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                                  "ConditionAndCommandPairList": [
                                    {
-                                      "TargetCells": {
-                                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                        "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D2"
+                                      "Condition": {
+                                        "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                        "param": {
+                                          "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                                          "cellLocations": [
+                                            {
+                                              "SerializeProperty": "=选择项"
+                                            }
+                                          ]
+                                        },
+                                        "value": "重命名"
                                      },
-                                      "PropertyType": 5,
-                                      "Value": false
-                                    }
-                                  ]
-                                },
-                                {
-                                  "$type": "SetFocusCommand.SetFocusCommand, SetFocusCommand",
-                                  "TargetCell": {
-                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                    "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D2"
-                                  }
-                                }
-                              ],
-                              "ID": "4beed9af-0aa4-49b3-97e7-8a9af97c7f84"
-                            },
-                            {
-                              "Condition": {
-                                "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                                "param": {
-                                  "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
-                                  "cellLocations": [
-                                    {
-                                      "SerializeProperty": "=选择项"
-                                    }
-                                  ]
-                                },
-                                "value": "删除"
-                              },
-                              "CommandList": [
-                                {
-                                  "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
-                                  "TableName": "TODO",
-                                  "UpdateType": "delete",
-                                  "ShowConfirm": false,
-                                  "RowsToUpdate": 1,
-                                  "RowsToUpdateCondition": {
-                                    "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                                    "ColumnBindingInfo": {
-                                      "TableName": "TODO",
-                                      "ColumnName": "分类",
-                                      "GUID": "5576f141-930d-4621-8551-5039c2e8ce5b"
+                                      "CommandList": [
+                                        {
+                                          "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+                                          "PropertyItemsList": [
+                                            {
+                                              "TargetCells": {
+                                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                                "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D2"
+                                              },
+                                              "PropertyType": 5,
+                                              "Value": false
+                                            }
+                                          ]
+                                        },
+                                        {
+                                          "$type": "SetFocusCommand.SetFocusCommand, SetFocusCommand",
+                                          "TargetCell": {
+                                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                            "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D2"
+                                          }
+                                        }
+                                      ],
+                                      "ID": "07ccd2ee-b36b-4840-8339-8389a8e2ccb0"
                                    },
-                                    "Value": {
-                                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                      "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D4"
-                                    }
-                                  },
-                                  "NextUpdateDataTableCommand": {
-                                    "TableName": "TODO_分类",
-                                    "UpdateType": "delete",
-                                    "ShowConfirm": false,
-                                    "RowsToUpdate": 1,
-                                    "RowsToUpdateCondition": {
-                                      "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                                      "ColumnBindingInfo": {
-                                        "TableName": "TODO_分类",
-                                        "ColumnName": "ID",
-                                        "GUID": "b867ecae-dca8-4e30-b367-56811689207e"
+                                    {
+                                      "Condition": {
+                                        "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                        "param": {
+                                          "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                                          "cellLocations": [
+                                            {
+                                              "SerializeProperty": "=选择项"
+                                            }
+                                          ]
+                                        },
+                                        "value": "删除"
                                      },
-                                      "Value": {
-                                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                        "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D4"
-                                      }
+                                      "CommandList": [
+                                        {
+                                          "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                                          "TableName": "TODO",
+                                          "UpdateType": "delete",
+                                          "ShowConfirm": false,
+                                          "RowsToUpdate": 1,
+                                          "RowsToUpdateCondition": {
+                                            "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                                            "ColumnBindingInfo": {
+                                              "TableName": "TODO",
+                                              "ColumnName": "分类",
+                                              "GUID": "5576f141-930d-4621-8551-5039c2e8ce5b"
+                                            },
+                                            "Value": {
+                                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                              "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D4"
+                                            }
+                                          },
+                                          "NextUpdateDataTableCommand": {
+                                            "TableName": "TODO_分类",
+                                            "UpdateType": "delete",
+                                            "ShowConfirm": false,
+                                            "RowsToUpdate": 1,
+                                            "RowsToUpdateCondition": {
+                                              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                                              "ColumnBindingInfo": {
+                                                "TableName": "TODO_分类",
+                                                "ColumnName": "ID",
+                                                "GUID": "b867ecae-dca8-4e30-b367-56811689207e"
+                                              },
+                                              "Value": {
+                                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                                "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!D4"
+                                              }
+                                            }
+                                          }
+                                        }
+                                      ],
+                                      "ID": "7811f55a-47dd-46b4-a1e9-b20f015eec6a"
                                    }
-                                  }
+                                  ]
                                }
                              ],
-                              "ID": "9596a74b-9454-430f-97f3-9df4338b5a74"
+                              "ID": "d87ca3d8-7529-4134-95a1-654d947d5e44"
                            }
                          ]
                        }
                      ],
-                      "ID": "a6335d4f-136f-4602-a3e4-4d4ec742bddb"
-                    }
-                  ]
-                }
-              ],
-              "ParamProperties": {
-                "IsOK": "是否为确定",
-                "选择项": "选择项"
+                      "ParamProperties": {
+                        "IsOK": "是否为确定",
+                        "选择项": "选择项"
+                      }
+                    },
+                    "PageName": "列表菜单"
+                  }
+                ],
+                "ID": "97096133-2ae9-436c-b5a9-8ddc71e63cc2"
+              },
+              {
+                "CommandList": [
+                  {
+                    "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+                    "FourStandardStyle": "warning",
+                    "Message": "内置分类不可删除"
+                  }
+                ],
+                "ID": "9e71149d-437f-4084-992a-c17913458652"
              }
-            },
-            "PageName": "列表菜单"
+            ]
          }
        ],
        "ToolTip": "编辑",
@@ -265,7 +306,8 @@
        "UseCellForeColor": true
      },
      "RulesGuidList": [
-        "83c23fad-d233-4ba4-a17f-f26c08c386e9"
+        "83c23fad-d233-4ba4-a17f-f26c08c386e9",
+        "bfc03a98-5bd1-4935-8763-9585b88c0496"
      ]
    },
    "1,5": {
@@ -342,6 +384,22 @@
          "IsDisabled": false,
          "IsInvisible": false,
          "IsReadOnly": false
+        },
+        {
+          "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+          "Formula": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=c273b140d3b24036903f81cf5f56c0f!$D$2=\"系统通知\""
+          },
+          "Priority": 2,
+          "GUID": "bfc03a98-5bd1-4935-8763-9585b88c0496",
+          "StyleInfo": {
+            "Underline": null,
+            "Strikethrough": null
+          },
+          "IsDisabled": false,
+          "IsInvisible": true,
+          "IsReadOnly": false
        }
      ]
    }
@@ -350,4 +408,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//Hfa5Jp39CWC7Gentku+b+ksJ4FdEJAAKiS53y0mqjoVuqKvW9UnpgIuATF2xmQVlPhtVEjFLAesmCR9k7HtOs4w44YXvalWASNcAlqDAZLP9Bgww2kz/txAQlc213p/9QL0NA8NnKB9ssm57NuTm/ZNYTEqSA3942eWNTjcNuneVYZujNzGoxBhAkp10kB9j0mUeGCN+MaruaM++d3UxvqlcPcd/jAW/LQ1F1WyEnI63pgAlXgvEFwOOpFQu0Hf4idp5HOT4q85/RHcyslmh6aprQrzVGHCNuJOYD4YURye8rqa4qsznSlVK22c3XU2VQLRn2IndrqBfqeF78Eu74p+PKi0JQCc8waSAOlqNc4gjcZ5li0SaxTr89pFCDD9Dl2Z6rBvw8mTbJc9N5+R027YQ8BQXzX6/H3ZA7ysh9Vk8Az/WiGEjhneqJYLT5kBB1aGm2C8devQGwJ9Pzue8iOLBZ1mg4JBn2Nr6k4+fPV6KI5P9EkNgUrSyzyaATTjnWrK1tjTTiIJQGfw2ha4GIs52eN2Z+gVByHvITItnd6wty7LyeWWZzAhjWoDlHaLt14yiHJjqXnBmnIh/36LAYKG6tXHyaY4nCrylZMk1j5bnZaIMzbIubUXGeEGx4Vaktc6Ww5X2mmzSLIalezhaMfjTr8lkbxHVIXsNzjCphgpKOSYt/ZpmmUz1a6ZYPE/dRvmLLTmGEq83xg0P2Z9nb5coyKBwFNsNcdR1O1+iUEIz/X/Dm1LBg0Qz+hGjRCxrJcuymJtjtq6LUggMWXg3lv113TliEtUJgSNwu3gsI3/bJS6+wNqZ2KZmMgT5ScYQbN69EUcJDF70HX/R8nq7XyFiL7EyJqTtO0kkYNOEjemENamQIc2yiWw9NUQGac3eGJBt3rqdbj2nXR1k9TpArw==|920
+}//ItNmx7RFap/gcrOiKwgCFSd2M87R/PQOr7dXZq25atcRNl+uOHgqF4nFqDHevp4OSB+Ah5lV2gOEY7UXH8j/tr1veMY6eR/RVbGE3rSXpM73cgWU/TrNOzr+oGa0xuY8Nxn6f68nbX1VcSwbZyc3bNG6DjTdi4nuVpUUFWRdw9XV4m8tM0Lu1pF5CcwKrKSI/MQ8jifZjo8Sv9SmwkGa1iJS91QawjHIyq1ZN87mTW44riTolsk8hLE8DpS0PxQhUePFtlvodKzfHdVbanLmZJnLU8oZQSljv2cDfwDevd6PvbSOCbDc+fw2EapaBacONq3C06ZC67t9Kc6MwIyL2qcSZXSFkrZUcap5KRRn7IpwAVXUeBrPjPqgB3rtvu4EamD5Yuk8XsarmkHCCRJ37Zz184DFuW3f5+dGfyi5xkCg7Tr6db4hoUvP555vPWj+stEmXgARyvs1ttaUrNvNT1+sRd7d2hu/IKB7snQMpC5DwyycE5nUy4woOo0+xf7/eCWq1zKTB87rqlBMO9Umx8KMyokp8AA/OmNNAYk7ijLGABBbaFHXyNhA9pnYR/T8aPRJY26h5YAiRU6C6ArZh/2n3E8y8B3foCyofeIFemJiumyMfD0V/qZi7GETmTfxeaqsCYnSdQJqZWq43V7k2lwIVAeMSl3Kxq+l0YOhxwnpwrP9zL0sRWw/LRPm13PkIdFrGi7mBOl6wyIm1KzBtkjawCr+KPQ4hBRPWNu/C+jWD7idu6HXWJGkgVCDJ8oIQ/KDhSgu6FAHTo1gmm2Ejbvn/dTa6fgvZfn2B3CwqDQe/nOD0FD8OlrhA/zKfnw7rBbhC/yWnpt3UEYMtyG6j84n5PYlzhoklZ+HKrfp7d/OQc+iFWmAReJ1t4W/LhnzE0OMQiSXPcpGww8UsdMO5g==|920
--- a/Pages/工时/个人工时首页.json
+++ b/Pages/工时/个人工时首页.json
@@ -419,15 +419,6 @@
          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
          "TableName": "View_任务工时统计",
          "BindingInfos": [
-            {
-              "GUID": "d0dc8b54-22d8-4e76-9f6c-6b9b8fe442cb",
-              "BindingInfo": {
-                "TableName": "View_任务工时统计",
-                "ColumnName": "ID",
-                "GUID": "9762de83-e504-4560-a886-e34b674c76d0"
-              },
-              "ColumnName": "ID"
-            },
            {
              "GUID": "b116312e-7c44-4481-849a-029ee025a685",
              "BindingInfo": {
@@ -505,36 +496,17 @@
              "GUID": "f8cc3269-2ec9-497f-ad59-37421f697b2d",
              "BindingInfo": {
                "TableName": "View_任务工时统计",
-                "ColumnName": "实际工时",
-                "GUID": "4f714ff4-e7ee-4751-a697-d9f1d490f1f8"
+                "ColumnName": "核定工时",
+                "GUID": "a958bb4c-a4cd-4a56-b7a0-89a6e4fc5f51"
              },
              "ColumnName": "核定工时"
            },
-            {
-              "GUID": "2821bf03-b994-463f-b264-44e5b19b8b17",
-              "BindingInfo": {
-                "TableName": "View_任务工时统计",
-                "ColumnName": "请款单ID",
-                "GUID": "9f1e6a2f-a8db-4fba-9aeb-fe80cad985f4",
-                "RelationBinding": {
-                  "RelatedTable": "收益请款单表",
-                  "RelatedColumn": "ID",
-                  "DisplayColumn": "状态",
-                  "NextRelationBinding": {
-                    "RelatedTable": "请款单状态",
-                    "RelatedColumn": "状态码",
-                    "DisplayColumn": "状态"
-                  }
-                }
-              },
-              "ColumnName": "状态"
-            },
            {
              "GUID": "bcb46917-c728-4c59-9aa6-d08fcd24f112",
              "BindingInfo": {
                "TableName": "View_任务工时统计",
-                "ColumnName": "计算提成",
-                "GUID": "bb07213f-6e8c-4118-88d6-af63de028874"
+                "ColumnName": "核定收益",
+                "GUID": "eeb3851c-bdb9-4290-ab51-4712534c1ebd"
              },
              "ColumnName": "核定收益"
            }
@@ -1119,4 +1091,4 @@
      "Formula": "个人工时首页!$F$11"
    }
  ]
-}//Yx3HaerXWisJ+2dlFycI2X11LihtZ3VkjfTX+GCiuRvm1246bJHxJ+dB/chipB+9oOEA3ViOTS/LBNsVz3TXQ/BX9aF0xf5SWcptjbD3EQt1YWoUxBKPxgU2Gj4SUlbLyZ1/SGtKmcg8WCUaQ36lVaohi4xYWAxVTxltf8wzSCucFqTnLXARZiunV35ULd3nvDQDgq+/3RvvAZgzlrtjrsrVR0kNwwy4HIBSUAYtpOnf58LiqOZFmZ6XHeN2m+I14MxLND5gxNkLW7eY/uRvi5XexOw3ttOKm3Z9ffrEWFz+5RvyGuE4xv9GmlibKI9WXou7oxr97qxoeky40Nslvvyf00J9+Gm1YqIekXYJSu/l+ZT62wkmIy8VJrT0AYNTy7uxTI2FPbtgcWRnh1QxPh4zOglAw1hG9pW1hHPrFlW6AYZtr7xwL/uR7FW7OjSbfQ2mVZw5y36jAy0HhV0+FiIWkn9hiSJmakoBCcax5H/p/EkqnjSzudcF6zsakERWs85fTGBzOTixfkIzBYbYHjmTLxg0d74+Z4GYYndGVhkRsxz0i1VeDEYm6XLDRRE3nYfhF2l/QLuUZsie/pq9VIbw89E8Gme+FFiGlRH/FL1QPBLlPF4Wh/yU/BtR1K4Taf3mLjfbAVJcIz6zy19RCfuGzzJ2gsWytUG42z5fgI5C2fL8hhHKNmRvT6v1b+7JnDpa0iipVE6Fo2Tj6Hah3yBQ0x/CUDWJ72PyAjpxgP7P1jtIb2Lt8J94M+BN6T7rn9XzAds6+bsP60PGuOjNYshjC+GF3f3WyVnFb1rnnxDk4U9b9ydA/F0EYDjgly4tmH1YUgOCklwQwNaARwHbJC0FlWgmZnpPjAMaN8bzzPmCJEFUmRamKMU+H7xPvPzBd3BpdCErp9AW/FIo+4tLDg==|920
+}//5NCpcG9Nfj/IU7uilvk+XDf20Py0xSxKLXLChSUhA0qvlB/pn8wXBGY6YE3HztLghqE5QMqBnO+YKaa70eh/zc38Zo8L6wHcgxxx0DgntZHxP8oDOfUwlLIC/jH20xgfRuhBMnrvzdq91QEi5gN0otzJ63dKUFGjw4RZuaWflTmi/4XAImXt++sDVJSZnoW3ZS+1yUO9bf3HoDSg3w49Qbix5To+ULXGRPVyIUCHub7D8pDDA3kcxP/WComJOLKrMW50Dae8XstY0rhzg5ZoyRaiIKUy+yfuQgTRnCUMfGRDr2HEtKsJNAYzs8TDYHdeAfRJ9VE+J79THPqv9hjMLOWKgsoUFDeZNyDiFDAFzB8isGRWg7mEw3YjkIX9MVzgYLPAfPWuQp/xJks53teeJLXwq0KtYGS8Y0PfI9VSiKEVqjVIHjyamUZ9zytN+fiUOlG9M0hFnlBdTUsA+wGAa1X7ssZ+qokTZLqHcT7hebmLz3ZvPFPT9m/AOkqv7xwzn7w4U44CiapuV3kSW+KmVLvYm7AIBDTr0kkF9ywDYzialQ7oDp/aBENMW2TiQRsvXkIeNukGXuUbQMK9SIkPh/6P3Ksv0V/4fibQSZH6aVFdguUOoADumWsz/Ndo96KFn7PQQM7K3bX1uf9+KsDhJf87JLr1KYti8FK4Dht8fOMHovCk//0KkR3u2iQ8U5RZwKZsyG7TLsmV7esRrXjw4BJEgTnE0HNhGwVHMS5vmhUzg0mQOPjYY7LbzbwcF9qZYDvM6DLekApiEIoB6nT1smYpjL6sLaqRjLerlC1Oiiwdo90dKRsi2TYJwKs2RP2YUN8iHZz07ZPvKvtcAZExFOuD2+GhnTUPElpRbpx7kPLnyuh1u3wS2eK2bVU4Mbkne1Khn5zPZ8QfsuvI4o/OeQ==|920
--- a/Pages/工时/任务工时统计.json
+++ b/Pages/工时/任务工时统计.json
@@ -496,7 +496,7 @@
      "BindingInfo": {
        "TableName": "View_任务工时统计",
        "ColumnName": "任务ID",
-        "GUID": "f1528479-cac5-4ccd-9029-eaf6d58f6adc",
+        "GUID": "ca097741-4170-432c-9fb5-9fa9ef563ca7",
        "RelationBinding": {
          "RelatedTable": "任务平行视图",
          "RelatedColumn": "ID",
@@ -560,7 +560,7 @@
      },
      "BindingInfo": {
        "TableName": "View_任务工时统计",
-        "ColumnName": "总实际工时",
+        "ColumnName": "总核定工时",
        "GUID": "363a92ae-8ff9-4dad-9bb8-534aed6a9b7c"
      }
    },
@@ -657,17 +657,17 @@
    "2,26,1,3",
    "2,14,1,3",
    "2,4,1,2",
+    "2,9,1,2",
    "1,1,1,3",
    "1,4,1,2",
    "1,6,1,3",
+    "1,9,1,2",
    "1,11,1,3",
    "1,14,1,3",
    "1,17,1,3",
    "1,20,1,3",
    "1,23,1,3",
-    "1,26,1,3",
-    "2,9,1,2",
-    "1,9,1,2"
+    "1,26,1,3"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -693,4 +693,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//HDhGlcSRf6AEDpCQM6GqyTpwzLY7BObEpCydlZmaN7qBHSdgmukgtJRZuDem6Ra2O1DdI3cV9A0mOcSe64OO1kWraCelDWg8uG9wD+UyZjvfHKbsiHWDu4Tk6+Pp+sGuqIQofcKxm4Fnb59suAhqvvViJ5z6tNMVPFHH6SIqMxqrHaMfVkaq3Pj5mwRn0TPHgfI9dVAawQW2sTzjpFd5TT7madVNYXWfkk54M5kEKKcoeqSgrIaueuoUquqgA0dfGrdcsQlDc5IZxvp2qXm7kc9fBBncB72rvWugLZIlhjsAwEVW2+w9CkbCtQwHjoJO7TqcpyefI/TAAYRfUIOXfvfvsIiFFg16BbLC1ATQ6yj86ruXjpWZTZqWHDBOtnZlSoF8Cl//sxQJAFDNHx3Iz3XTRrLeP4sYS2rvjyOrWEI+nUkEUDpqaFdgkWqB0eRX0fpd5eB6ms16QFzGX0n0tTpLd9MwpmQzrU5zahYOPeIFwUfNxUcjuaSuTWzocUMAjjn/WOsjAU9ibiyz1r83Y4RyWpnJjT58xSaDt2M4Xy3pCXcVb1X1a5QNaoAcsFJvdJASaRg8+X6eENHjXVbYZA2FIU0sUt/4KGSbTyWJab4l8vdRCedf4kXdqsT3R/vt+g/gJDzPlZmBwMs1kp0YL4QDwVQZpT2mT2IPBZSDY+BY+iayxcNO2u+dAypckzQdXAPbPi/Kp12Co3AxiMmcFQj2R9v30FniXDly+9nklphcFG1/LnaYrkIonniNMbludnSRcTlip4m3Y2Y6tAJeNFUyWRM8KM36TcgHfHxw9WP7EDBwnTE2MTm4yy7wF3LzJD15YOCLKGtX8Mt79znHnFPZa3lr0h9Ro+II7L8H56xJmUf01uWGDEWfV4n4FUW9hWn9uyomRQn/aL5cBTO1zw==|920
+}//AnJd2wnQMtuIEZLGJKf6ESYmxgQlMbzAYEku3R1p+BNNIQuYBIpBCaHT7VX66czhx87C+0BcfYlFBeUG49NEIIq5ZDz2juh/1nueZ6HJCpqkO3pZeQ7Yo/TbZ+SH9lN9wGFgWm+WrlzQMbLDOQWpWIH1IQNWjt1iq8FoSbTJqveW3QwnId2AiJc4StcPLm0AXT9gLiVhgs945SEf7s1K8/ull4+tq3ImIx5nqCKsaeTagVyHLIMFjQ24/l11mTooIuCbzXNarrfJxVp2wvzTq2N00x9YwZBsDHAuSWjz1L6puuFKJpcXqtcllOtz45wFdS2E+0+LE4Vzh9N9mWrbdcQko2Q0hAfCvpUM/ehgoIPZLJRUrHvzd23sgdp2Zjztp30T9YynyUK/aZBs4HvuUBq6HI6eiPctUDYTK8HaZb1ca62S2oD6iKkw2+inZeZqXVW060DwcHGHfqzJb0YtQ+3B99G///kXP5iJZxdPWbs0o0j4PbWYiYExpbnjTX19FR+dkGcSyKgRLnMHxR4qT9RB8N4vBVZcuT9mcviZXa8ZVMbDaGZfuNn3Bwp0PtLigt+QeuZE2+LZmnxZuYRnwP34pBZw5OfJxGX+gPsQt56RawqoFC8Q/QA4hGKYAY2T9OCdPVzH49blWP1XiVa3LgvZ3G1WANvqz0LtHuN+ti7f/ZkBIgWITrYeYaNqmr2n2UzGSOV5b19dtfXJvVmNFPXjcvXr/WOXQ8VwJp54/L/oAG/g6HfrbnukMieBU9Tm+vO1TjkOX+n20bsZpyI3hm1rC4Z0+Iae46uYYm554Bn+HbOOSILAhAGH8tS7qmFTkfYKDAu0uo4hzw/RlFx+yEiBspvWqpL8gbphzSX96SQ7XWgv+YB9r2UEe9kL8vuJ2+/HSvoBBIBpPqkTu3SoPA==|920
--- a/Pages/工时/工时总览.json
+++ b/Pages/工时/工时总览.json
@@ -338,15 +338,6 @@
          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
          "TableName": "View_任务工时统计",
          "BindingInfos": [
-            {
-              "GUID": "0020629c-91a8-4450-b32a-7e3ab1b88683",
-              "BindingInfo": {
-                "TableName": "View_任务工时统计",
-                "ColumnName": "ID",
-                "GUID": "fe80e481-3c55-4e73-b9ec-cf66a5094440"
-              },
-              "ColumnName": "ID"
-            },
            {
              "GUID": "3ffc6557-519c-467a-8ea6-e7dc44a6fbcd",
              "BindingInfo": {
@@ -437,8 +428,8 @@
              "GUID": "976acc90-73d8-4e7f-bbe8-19f6d5170d80",
              "BindingInfo": {
                "TableName": "View_任务工时统计",
-                "ColumnName": "实际工时",
-                "GUID": "eb4a7c0f-e788-45fa-9157-1d33f0f823e6"
+                "ColumnName": "核定工时",
+                "GUID": "c0c5f87e-a192-49a7-8e38-61519cfadfe5"
              },
              "ColumnName": "核定工时"
            },
@@ -446,29 +437,10 @@
              "GUID": "2a97dd54-f2d2-44e7-9758-cb2e1c24e73c",
              "BindingInfo": {
                "TableName": "View_任务工时统计",
-                "ColumnName": "计算提成",
-                "GUID": "2eb14824-8795-4912-a445-4735de12d692"
+                "ColumnName": "核定收益",
+                "GUID": "38e42d44-fe33-43b9-86f6-5f181c7f0f12"
              },
              "ColumnName": "核定收益"
-            },
-            {
-              "GUID": "b7dfba01-e0b2-443f-bd5b-bdc169497382",
-              "BindingInfo": {
-                "TableName": "View_任务工时统计",
-                "ColumnName": "请款单ID",
-                "GUID": "a6efef98-705e-4ed1-9032-74360893f2af",
-                "RelationBinding": {
-                  "RelatedTable": "收益请款单表",
-                  "RelatedColumn": "ID",
-                  "DisplayColumn": "状态",
-                  "NextRelationBinding": {
-                    "RelatedTable": "请款单状态",
-                    "RelatedColumn": "状态码",
-                    "DisplayColumn": "状态"
-                  }
-                }
-              },
-              "ColumnName": "状态"
            }
          ],
          "SqlCondition": {
@@ -905,4 +877,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//q2ktkKvFm2ZUMuMIpTDDMCAJGkpbT2mCbBh5nQ5hJ6trQ+OqdAYHfFhtxQnReWYnL6JaJb1uQ1OcywBg4S0iH+5GmG/Jz8yrVhYTVQNgSe92RqOnyAamYJYfJBUrx/ot2Tv3ga1fGUIxpiSnhWypzBOeGfphqdnkiwGHA2myMA7a/C4NLcW0VWXm9AHyG2yO6cbzAih8vA1aytskLKUaZNo/W515WPkMkLvoOKOL2NOGC47ei6mC2sLi+cUvbVUfJdm1uIbiGnTxBKLzgcWQwXogrHZATUbJ9Cj4ASNTHmidY7j90taIrVqy3p8O/VnB0bX0jHn2r+/oOXEw+TyjHVBbCPVtHJv6Z1GildSETfOHIZSlwabQ6ZKDhAAGZBMQsYvUcWBYkDcoN7jUlvUMyyXgafWwWATVl5Kn5n2IlQdVkp9/Zyk9gdoBNMog5UWR/Qk4m6TSDngP/uEXKXaltzCAG2jspTi/BS4nRLrTNtkttnoywQreIbf0AZ5Eg5WaDFRtg+9CM+CgKdkAUmd/VyAtF0zxESVDXVsSofWF0jTCJECCag90iWb53Zbpre5hWcYky8BVa4OTncp3UDX29JLQY24+ufqE4L9xml/Lc22m0eVX0XFy4NowAooYnuNzHCOqaQVHyLmjOMRLqtmfOSfKOBPvHf0Km9JOku4AFHztOHjT1o35B8gB7XZiXeFq5/YzZvDuKOg6wWlbFv1n9gchcxfedjyAZyv6op0NUi2iOxWQFL36mqtJVMUxXsEOhZ59iDS65tWsq4+YDXzyGfnCBX0k42x6rvrgwJ4OabHh5Jh8tjLTg6TJQ7/kvAbf9yZk85QjzGm0Y3p4dBujO26zy0jm974lso/Ij7KGpy0R6dRKuSBAjzA5eaEAaCVKhRBAwX1kyviK/DJry1J+2A==|920
+}//8/lFA8gtG4Wjj6t/G4Gers7WqosN+myk8XHbtKjbS3v/F7wqWuK1L0L98Zebb7I/H7vgto/K6peRNGfa4RYsvBYp1W8eJRar41rq+UNdH1S2a7mUDG0Y2Y2XGiHzAeaG9ZYiOq1iFKjNAnTnou5ZPwbCxxPP6vU8VHOHyOYuZ8hPfa2mEcQzfQEuOWtsjwCjEAWYGnyb2BnaUGTHgtnGVnIj2ECEkQyfjkxsfmf0EimXz3l7OAxZh1iMalyh7nxW0PJEMNf1qoR8nOnZXFWE+GUTsohCMpkBaURa5MuitTzRNokdXGlMWWPzqpzcuAQefn44uGslqZRwM8usYUL6LZcVQGc10KvVKTyO9pSekEFfTWLYxVbxkjgHLo9WBH3Hb5A637rdtYhORrt4rcGvFzRlVTbcs++9hOLJPTj9q0rvPrp+wC2cQ3c35ss5khFiFtHEz3SKek7KIbY5ixraoLNeO/9jbPwNNvIySnyATZettd+DSOw9l6bAaegYkN68PJlYE0wQAz1pC4A/DBPYYZZlEELC3gCBCLBRZ0nunxE0n2lTa0SYMZojMFPM7WhO87eWLjfbSVXHAZL7wSaGdoeD/FsfDltr84XLKXlhzaCuZmd6wx3Ax8oYpWbv4Qw4dXF2E+Z1SyvUMEvObD1i+Q+KCl+B281xAnBuyeJKacEYvXF9Qn0MVM9WOTWWT08vzhVlgx8lckVzZ4Wm9xZHpsT77oLIsSY067g3dU+Vu5bQExACjjjcWsy25JxElvZcbI1ne57yATaGAoJtJvzg2Iky+smbl23ArFOASrUYzPBDq3HJb8RARnqsZ3yrwAYq0HrYrk9fxYXolyRTWglpA8Iw+TkHWGF3DJVny2vsuK+OhE+ONFdV1sm8SpElnrB0+Ad52Xh2oa3n8pTyUhlceg==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时详情.json
@@ -301,7 +301,7 @@
              "GUID": "c2efb933-40aa-4dad-8fc3-1c7dfdf07441",
              "BindingInfo": {
                "TableName": "View_任务工时统计",
-                "ColumnName": "总实际工时",
+                "ColumnName": "总核定工时",
                "GUID": "f3031096-d234-4bca-9130-c455e8ca7f03"
              },
              "ColumnName": "总实际工时"
@@ -370,7 +370,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "02db7acb-81e8-4de0-afc9-0794c39ac64b"
+                "ID": "cbe09e93-b1d0-4cce-b7be-bd0b557f1f44"
              },
              {
                "CommandList": [
@@ -380,7 +380,7 @@
                    "Message": "你尚未成为该任务参与人，不能报工"
                  }
                ],
-                "ID": "dd422ce4-45ad-462e-8ff2-fa2b72a380b4"
+                "ID": "3f46914e-29fe-4093-8824-025db5eea0bc"
              }
            ]
          }
@@ -436,7 +436,7 @@
                    "LoadBindingDataOption": 1
                  }
                ],
-                "ID": "2f9cd6ba-4e5e-4907-96fc-76df69a87028"
+                "ID": "42615e40-02b3-4489-bda6-f5a90b75318b"
              },
              {
                "CommandList": [
@@ -446,7 +446,7 @@
                    "Message": "你尚未成为该任务参与人，不能报工"
                  }
                ],
-                "ID": "c2f5dcdf-9fca-4065-ae4c-7c6eab31c7ec"
+                "ID": "9dc52194-b130-4a31-a891-dfd2a1a36c73"
              }
            ]
          }
@@ -786,4 +786,4 @@
      "Formula": "工时详情!$E$13"
    }
  ]
-}//pCtTG77pGQC1cIgwIR19G8W9DWu9wy6bjhQKf0tuwrBYf5UrC9VSR1YylCaey9wVK+d5dox/CGeZC0hrcP6KO86pw9z4RP+32epv5bnz9uTvDjgeVS/8SzL+gFaduajy5H8dkKZuRw+Bj2NMyXw5z8x2+J4f1gRvztSbNgXI1Xm44Jlwke1yyYt1IsI1Zwxb6NU6jttb/E0ASeGv0rJu7x/KTl0PiF9kOfI1bBkhDEa3k6lMEw1mY5pCfYrf7BWYGiN02uwTcx1311L3LLVkLzeUvZ1+bUfgXUpzGJk5G0f1FJTQm4YzDfYBA9Pg0cXtWzFnfjfV3bJMQAYFDf99fmDhGo/E+c6cw8ERzQSu6PTo40JgrXMZZEPHcZL5ZjNVj2i/INH5Nno+Otb/mXcUZQXFYFiWq5S7ev4JAHepstbcQpEbYuoyJYRaGIKma/H8CumupdCApo6gKvOVlF5LbvE7HGRAjRdn/4tj4w9Vo7an74fZBqzglSh8QAHn5KCT/ywp8JnA+HdoAyqeR7B0srqD2sgtc5kHQJPi6bm5dC0ctwMmyEDD4k5j69LDLsURoZcClIARE86xMQj2nyWthzJ4vpp/6551+wcECyFsA3NDl/xOXeeBSwuShaf7ppwfD4AgevfZKkt80/2vZnw7zxm2zubYKLG5AerjkKdHEMl1pAjPCoGhHuI7KMZG39GIAl/h8dBfAf9Qwa7DHBoOD1AMJYPHrX5JLkZai7mqKw8hlDUpQBIRX3ToDAmDayFlPNexKg75rB6wktfdwoEAo1boFTO0u3gxWt/vznxpQ9IOkrobQihXIiS9qn6W4Yhddz6WBRLhVd53hdKa8+VA1jN8FWSlGVSoFgtRCLqWR0uexrTb58alp6KZxM5CdDs+101UOrhLIOtBrJqQF5BmQQ==|920
+}//9CrSz2ffdRp38ujSZJg28pO0RFgN3ImA/71Fa4Omlj85gW1vI6kn+h5YqRWhFSTWGYjm6vqcrR4fV+0jbCrqgS4gmnS/ljBq0x33yRMQFrmvL4SHuu1MSgQM030wftuP3aE7jRL5nZfScfP8yARhH/WDvUB1RGtJ/d54uxeYa1Cat+XgSc4GUvUIh7xfxPv25YYCHGsNY9Tk3NXG+X3bCHkZ3YBPETaIKOAOMP6XAIgm7zmsDrYEIl7f2ll8OXnclqEr3TCJQow+31Q3qCaS9folIy1JAhPEUAbVjULCsqTUlcJroL1jktD50gpwp5sI+rh0e135M26OgEpDO5TwnTmnmlrqAX4SWxhZykgqgqUMk+yhnLGaI8ksSXC1GGfipezw0rS8KYIdTYd6LRlUQ0F98eYT9SobrP5S6SiqktMc8LYkRQtAJLow1f/EcOxOoqdGFCzgmEln2npFeHSpiHuMqEOLmjvAiDwaYC3gMdHMq+I4iW6S1T+uaG3QTPIeJ+6JRNzflcgNAFvGqGWgwj0yCqWGpnerE77JpofxzUN0CO7l2YXsqN0kZYbk87GNYrZha4QKWWiexpCaolyimknrR1TP/whGtEcKiGhiFhScEtgyVDNm1poqbr8CH8N+Vr5H26HyNTK3dXfvemHgkCIBPZVBvpZkNUV4/roJMYbRr2zOUv1aGPuZ4GI+qu8Lzu4OJxiM4815jlHuQlfidssdPrEc9HJnd45oCdxuIH80y6iy/aLiLnILiMDX853QEKyHaFrx+ZV8upSdF5UpJ79b5zcU4O0dxxXZMtXaL8Hy8QZCmX5En6eldLlS7gEFQ3oqR74Uj3f3uRJit2H8ujvIfaTzp8Cm2hAp34kZjGYBkFM/78liKUqFWtyeXWw8VvW2hANiv3+MsP7VLKy7Fg==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json
@@ -406,7 +406,7 @@
                          "GUID": "d5b407f4-0a67-4450-b2e4-8e5a8d33904a",
                          "BindingInfo": {
                            "TableName": "View_任务工时统计",
-                            "ColumnName": "总实际工时",
+                            "ColumnName": "总核定工时",
                            "GUID": "02533bb1-24de-4df8-b6a8-6ceec8a1fcc1"
                          },
                          "ColumnName": "总实际工时"
@@ -429,7 +429,7 @@
                    "ID": "6912426144fa4151a7665384b46d6a22"
                  }
                ],
-                "ID": "69d82f8b-0a1b-4de3-a523-6b3d4b2c56af"
+                "ID": "472ebd43-71e7-47ba-a5fb-07080c354808"
              },
              {
                "Condition": {
@@ -478,7 +478,7 @@
                          "GUID": "99624952-d6e5-48d5-93e8-dfe0bd167496",
                          "BindingInfo": {
                            "TableName": "View_任务工时统计",
-                            "ColumnName": "总实际工时",
+                            "ColumnName": "总核定工时",
                            "GUID": "d7ec7d6d-9b75-417a-8757-a5de515ea460"
                          },
                          "ColumnName": "总实际工时"
@@ -501,7 +501,7 @@
                    "ID": "4a25d702e22141f495cad5baf9ff1a9a"
                  }
                ],
-                "ID": "a7368e41-4af0-4ffd-8d42-210c295acb26"
+                "ID": "b0208333-eb9a-4f2e-9758-d775336bbecb"
              },
              {
                "Condition": {
@@ -549,7 +549,7 @@
                          "GUID": "2feb799a-ebe9-4aa1-822c-cd5399af1bf1",
                          "BindingInfo": {
                            "TableName": "View_任务工时统计",
-                            "ColumnName": "总实际工时",
+                            "ColumnName": "总核定工时",
                            "GUID": "0e51eedc-dab5-4e3f-8ad7-b9d0dd7df5df"
                          },
                          "ColumnName": "总实际工时"
@@ -571,7 +571,7 @@
                    "ID": "e22633b6551e4332ae99e03268670571"
                  }
                ],
-                "ID": "e16a8371-af72-46d1-9595-a627fae8df9d"
+                "ID": "3d1168ac-052f-49fd-98c8-d57d7d8882b8"
              }
            ]
          },
@@ -1090,4 +1090,4 @@
      "Formula": "项目工时!$B$6"
    }
  ]
-}//dv2S1sexC9q9M+MHwX88jIdhF35LOj+iv5li+Gmj28bSLXNQVjTpp/PS77CG6zel21ioUi5dygT5phSI9bZ1+OfD0ZM++N8MFRoOQBneZmEf03ObdHte6IhGlkW9zI6kloHxBhGncNrZcySUDve103kBKSCn2SYgLy+iNUWRTcelnBpvDZql1rVgDckIM/+bPOIgFPvXTGLS6eY2DAUy/LOMz7w755o6HHVZkrFDpYmLXFIrxgAVtwBzYhxUSiKEF/47nZv7Pg0rIrvLQoEmmTuR7iXrPr1D84uaKu7KuvPe0LlAelMV6SOA12y8J4/pcDpDZnRKLNplb42sW7kvcmZCCmvjv8lmgOnNhJYrIsNOEQPdaoQ9c5I+3dpEok07pIWFgvmbaIX/i9zkBXU6SeVxkrvVZcK45c8PBe9QOaPlpyNRx+i67DgjDCm2752xYdExRvjZDnilXBg2ZVzc2ULk71/bNI0WAQbTCC+DpnGF4jvB9TC/08SBZDGSif/5YrZosJNMr7AMVL6PMGKx/fIuALRmAMjGcQ0udAz1+Psuwk04s0DYmk55eeHb4pl3GCmruvjEdua2xmuSMoSOykqZOdGAoecE7YDbmLr0mtcimY9duQvSqlIQb/4Iu3oe26wuDfDsiWppnfElOw3mo6QLiBSF++EmcV53TwgAjxfR4fPNobft7T2gKSD+PuNuWOqhOXdM4Rqa6hOW0UMd9CUQBUqag/aPgiv8Sn6n8GS+7iK+TYP5CZhiaTH7bLl/r5dp83KXa1D+oulRtrwftZ/S83DZ8xvEsXngqxQy+UUAzJ6fRDbbtJUdtR0yEJv5kaJJoo4K6cdPMsBn1lSpL4K2dTsMAUnAJMGGruWwYseNbgI/2AmlxhQudf/T9Hu1Q0KCH69211/ONWbdvY8fNQ==|920
+}//mFVTrOlVyTqU+WOFXkeyiXwQglhxW8NQt8R9GfxfRFhga0iV75a9t29oac5X4862C365l1siPZn3YcT1OXKV+s5qx21m50WTHvrrdgG+siPaOQ6CnfRF8Kt31KPZOh/s/3965Z8DOvu0/j7o8m3e/ESUj0RgFkCq2rBI7peEMMCTFLIrnIGiQII8obpADDuN5TmOjOgBTsoMn0F9BAEV1vgGx5igVwSCXkedRBw2HAPFjFyOUnNYT6c8SThXwVrQsdgKl/NubGOfR+/WoDDfSWEuL/v/Ivri6wPDQn4ewP74udAR+YDU3QqJ817NsedilnCKIodQ8ScM4wUgKiq0mM7AArRfM7uEpLgI1kYXKAA1XKbSNQwU9FaNY/dt7srgBb/egoK43nvfxJxHRBR2OnYLhEF0SyUL0TIUfhEPNmzDScPftnRd93Qx+F/IOqBsTS8Hgxwm/uu7tzuO90qKGNnj85sCJsYNlRXNVYGi8ujeNQl0xaj2D/i04wevMhhl+H/11gQuSOvVu84L7+nlnPN24hhAdLBJxl4zsSpBmig52pi083hpdxO+1oMJqzZRHlwL7FmKCqx5/Axmlco/YyS3y4ayFQ7+7zUPj9W0FuvyWSlu61ctZwk46ITOS+oIZBYMYU/SG/J1L9Tg2Mpix7m5GeaT6hg/9fS76p8wDy9+7mI6bDEObGcnjFGALi6DgxV8zOBqN/acEJdPm7jC8R8a2svB0IXZ8utpGZVFncTuVz0S5ndvpKpCMeRE+BoT668HQya9KHZYwstyv8fBA6637yXjYBEUB6b4TZeSCSa4uBpzTqOVdWPYxtT2unrc9N8VE+mxWWcRCaw0VoIJTiSR/xj7fwU/JYRosIMKXY9kipF96okztgR7cBq8Lkb12R5lBvBbqz+WxbBrek/WCg==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json
--- a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd
@@ -1,14 +1,14 @@
 {
  "PageType": 0,
-  "ColumnCount": 55,
-  "RowCount": 4,
+  "ColumnCount": 38,
+  "RowCount": 7,
  "Formulas": {
-    "2,50": "AM3-AS3",
-    "1,18": "IFERROR(ROUNDUP(U3/I3*100,0),0)",
-    "1,30": "IFERROR(ROUNDUP(AG3/O3*100,0),0)",
-    "1,42": "IFERROR(ROUNDUP(AS3/AM3*100,0),0)",
-    "1,24": "IFERROR(ROUNDUP(AA3/O3*100,0),0)",
-    "1,48": "IFERROR(ROUNDUP(AY3/AM3*100,0),0)",
-    "1,12": "IFERROR(ROUNDUP(O3/I3*100,0),0)"
+    "1,21": "IFERROR(ROUNDUP(V5/J5*100,0),0)",
+    "1,9": "IFERROR(ROUNDUP(J5/F5*100,0),0)",
+    "1,17": "IFERROR(ROUNDUP(R5/J5*100,0),0)",
+    "1,29": "IFERROR(ROUNDUP(AD5/Z5*100,0),0)",
+    "4,33": "Z5-AD5",
+    "1,13": "IFERROR(ROUNDUP(N5/F5*100,0),0)",
+    "1,33": "IFERROR(ROUNDUP(AH5/Z5*100,0),0)"
  }
 }
--- a/Pages/项目/项目首页/项目首页-容器页面/项目负荷子页面.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目负荷子页面.json
@@ -275,7 +275,7 @@
              "GUID": "2da5e4a5-ecc3-4e89-ac0e-b6d0b4a7eb55",
              "BindingInfo": {
                "TableName": "View_任务工时统计",
-                "ColumnName": "总实际工时",
+                "ColumnName": "总核定工时",
                "GUID": "8cb3e3d0-345c-4b24-a10c-74b4666fabc3"
              },
              "ColumnName": "总实际工时"
@@ -350,7 +350,7 @@
                    "SampleJson": "[{\r\n    \"日期\":\"2024-01-01\"\r\n}]"
                  }
                ],
-                "ID": "bfbe81f8-6d48-40bf-a1d7-c16d8d948b8a"
+                "ID": "6c052661-3b95-43d5-812e-93f538027c29"
              },
              {
                "CommandList": [
@@ -361,7 +361,7 @@
                    "UpdateRowType": 2
                  }
                ],
-                "ID": "de0bc021-9f29-4bf7-8094-15e7c9dad8dc"
+                "ID": "590abf8a-dfe4-4977-885f-3d5938faa91a"
              }
            ]
          }
@@ -473,4 +473,4 @@
      "Formula": "项目负荷子页面!$A$3"
    }
  ]
-}//JRlVqpUP2DvgbRkYxU9eJNST5nGAMUMf7zcRp9oudqeOGVCrbDcBqVZ0eupWVBCHuTGBmKsICWoLR6nqvniiRlfF3M7bzoHwJWE7YGTBPxr/BFeHvIuwfELU4XIqB0HaMURUrRzgawrDPC1AQjOfZLRKCrD2GOUAWgGfTvQ0hUD4cKIOXUgPZ3ZOh725nOb+cZXTTIncr7eAEDygR+iXeIYASlw/TQYCZXdD88+3yzwfpzxAj/aEDUwcGZwnZC3ex9UE0f/2JrE1HX4kl/9FzuLjFFw9tpBQk0PFTUdLm/5g51XX8+DWzLoecb0y67XxMFDcmcElUUoUFXILMJNvMhSI4NRUezpVvFaT+TvO2mTh4a7aHamyZGzcK3QDxo4Ly0dw642RhtXpCIbQUBRSH3XoFsluv0Y4vfiMGZphDa1NgekG5W1jdGRi/BOVIyP/tLtSYpDfGmwFT9gQolhAYDeiij/FZw5XeCC1BIFyM56mgmC/7ylfgFU7YUFIDxWyeNY8QDOJ/cUtqnHhLNnV+OGID/X6bsrWBEALfFOSj2OwKuZS+/3sdbBid8SoYSLqHiHKvqc0GnM6iCdGaUT4/jzEqnTyLj7oUie3rR7r8RpP5HGxbt17zo3uvLaoWpdKAO5AO69GwSJarNKoWnXsbd06B7OpncdQ4Go8AhklHfmJf2Y/IgbJfqN3zWWwPyr1bWMWG81R4ca1H/sGu8i9t2pjAesS/YjSa6WQH+W7eAwII+yfeq3ACtfhGn4ebBxJQY+KcMcvN041/HvzTMBX5dHIMUH3RnU1M/i6IVEcR31pqOjWLjlL94uOLgvwKCNWSfraCM6N7toUxybc3WOJvz2KQ5sf93WejQmsK+umggo36rrekAMuu7gqNRA1hhlUOmbDxEyRTJHZ1/tl9rTp7w==|920
+}//MdlFTFtILkxfFzEcFaWTPhsydNtVffhgzz5suh+TYerX3MiEeFOkYm89iyPLNBXgS8vD9mlDczvXfWIi20XWiwDLJ93JWzcPV6RT0kBsQ0N0lRRiZ2Nh39n+thNjxuDHxD8GOvyXOXxdCgG2IP/NZl3CfDNobdFzfeujH+IBayzdMrW4nJh9j8ymkAc7zSrNeLLKllOpdJ3QM7sXtcyikA13b7nBip61WLB+PZlDz0IriQCBVZQSIvj5Xix/urYBHfiEpTDz++hPK2M77n2RLuhM5d8CKr5/1hSfORYP16uM4WgkXdFZ/dGnlo3IOpM+S9a3gNuk+6XJyI/gDhusL4O/+JDQ8/iT33I5JH2A9I+jhtphtxHzMBQET68XRodbzjdgTWfO+lV4tNitadx98LMZtedKhRXaLcaMmwYFG45fCAvUYYXCBkSF3awOHjY8ot6YXhVDDCZx4jqIhSFdZTyolNEJ8cvkqE0CvQmIRbZ20efIy4jepdcGEgh0cfMlpp4Isl81j5hdalZhO2qO/a3SxqMkcHYVlXpnNmS3WXe/AVOTYTrNf54jSITFCYScP0VbY3QYEZ939rlMb6KYvFBsHopqwEdNz/Szh9gXlG+5PPZ/QH+IVtF1K4QWZflrOq8aeJgKzYGd04JU5uOIlfNwNJliyV4x+mSTihvgHiKqEXBBDwgZAQwrq4jt5FUjx/oV4deaK/0znI/Yv5Grv1tfw/8DbeoMTis+8nP0Imj8/5c4E2DjdO+lP/d24vBKQcWicsqFF/NJ1cv03VX2SgIJvvvLygE2AaPqPFwhPrRMsnrbFvxr1kr1zmSMDpH1FGiCOtBKyxnyQP6bCwVDwfn7KZzwG3CRA9CUbrjaHnrSBqR61JTFrQx9/aqd2vZ15/eukizdCtgynb9qos+vrQ==|920
--- a/Pages/项目/项目首页/预算申请/预算申请.json
+++ b/Pages/项目/项目首页/预算申请/预算申请.json
@@ -94,12 +94,14 @@
      },
      "22": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 35.0
+          "DesignLengthInPixel": 35.0,
+          "IsHidden": true
        }
      },
      "23": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 32.0,
+          "IsHidden": true
        }
      }
    },
@@ -233,12 +235,12 @@
            "TemplateKey": "回退"
          },
          {
-            "ActionTitle": "终止",
+            "ActionTitle": "结束",
            "TemplateKey": "拒绝"
          },
          {
-            "ActionTitle": "拒绝",
-            "TemplateKey": "拒绝"
+            "ActionTitle": "暂存",
+            "TemplateKey": "暂存"
          }
        ]
      }
@@ -691,12 +693,12 @@
                            ]
                          }
                        ],
-                        "ID": "714b8c6e-37b1-41b8-8ff1-4cfc5f048d8c"
+                        "ID": "ff81eaa5-3dde-4d09-a65a-74811b5d1e9a"
                      }
                    ]
                  }
                ],
-                "ID": "c7aa2f46-ea6c-49ce-93b6-ac480b7467de"
+                "ID": "3944c2ad-008f-4ccc-a17a-753a52f50b6c"
              }
            ]
          }
@@ -901,7 +903,7 @@
                    "MethodName": "Refresh"
                  }
                ],
-                "ID": "d35e6acd-3ed7-445c-b528-272eb9dbc9ea"
+                "ID": "82d4c54b-d212-4963-9078-8128ae03eb2d"
              }
            ]
          }
@@ -1281,4 +1283,4 @@
      "Formula": "预算申请!$B$23"
    }
  ]
-}//JRPCjafuln4LtMAVCocop8fM+4hRG9X6GPU2CTR3i3qU5D2mJgKqItg0YubAW/YNNUtVt4q3HygYw5XJWE9QvRA+lVH7fMwvEMmn8gid0OyS0UXUEYl/+eEsCcNVTuyqWKVSKNyYCHEQHf+n5Ckz03xofGrn69IQxzN3uU+X5J97Ab7CfnLy4AD+DFnKkVFXguKAPJu6qARSN9tlW1T1L7HiRHlG7FGN7hVrJLXkJivXtiiVWWOV5EJ0ijZhR1VnW33SyHoezfmg0k0u/hBNTAWDAR3jjvQEI5nncGZwkd/weKpwaIBFLl4gLt1xctZC32WlTjT8P6Tzll2R7Q4ouuVv75FmCfkX9hI4oVnsri0cAPsYi1qyBO1LiKgzDRdI3/2fced6scwzRXf1XiOnEra+zRz7Oii/KYeCd27O4lJA7MZKOaOiMpb5MGmNS37k35NGR6uZYaGLNLQvag5qOH+9wpMzxmJJ4xu8zQTEA8u1Z8k6LlTzVBvkgje8gmPKxectYULIc3/sVNLSobipt1rpVnGtOnQCcRTywlA8/v2+xr8MlFqqq9BXeMT5pTvLnA9fHywEmfyl9qE495p1j+i4W7P4qdrAboWgcrSd5LoDF3Sq0U29fydQz6dA3u9Asw4pP48Ep9QldixM3fITmycBXKVqLbbuuLNwam++fdSgiIJy/QKnBifn7KQXMl6uZPNRQd8XQEwOgtmjG0tetARSeaMVMqDmBBUG+nLU9pJlkpn7kbLpCE9t4mvfGzesXeCP0/d1gEj6BxHSdHxFRTN3SdLIdgmyrWGlmKD5iRjxuBxX7bvFnE41FA8op/t4bb7ogG7hQqujRgvNCTo8wt5gg+M9V5jIINQRpeacgHGTIJT2nRbTOoR2IpzyQJGlGjE3NJvYDfKCb83lYxLhhw==|920
+}//oU7vpEz8/7FPHcz8VZRMend+/SJnkPHkn9e9+34KjfWAQN24pgJi91XdZe8DbTT0SgELEDqob9gVdONmUu4/c1cRNxR69eUckusupEghiKN3UprlnOKzKN6euS5yhXiBWP0Sdh+3vaIsaE8igESa5g6z2JsZBHaCrFo9MYd+4DvXIkVRJXXR5MkdPhp8gJ/CYpDSjoN30TAAKDf5jsrwKqXJpUZKXMWyPIzHG3eBYDLtpghMfLkaX7ioxkjJp0tfWYxBh1+y5a1EzHy2FwoTZZ32CSEvy3n3VX+JZWFbbx2mwhRAA9UAiUSWwIXeyXhEJwcLbsa5tcDcn3DWNXPLIr3HqURh6P/fjeA71XJ/PTV9BSKPxRYlxOmQF2h4iwuLQuNMbXBmzywDm58pJBIRAty1vX+NghxGxZxNbkF3FkEQGNFOLJHZBX/SYVsLNk/auJ+Dq0G4q43FCIWeJtG35vKlEI4Ge6xBl1EB+YIdwXNwsCgCWZJU00K1MMC/C8RLbvfLa1yw+e6KEy1k7geqA7XXh0eN5bGPH1jHCsEMcBBR6tpmgr/A8vAmd0b7x5esHANB6rFnyCfqdRXBPpcAp6QYbe5cn7iWanelc+IT4yFg5OG/0LLg9hRAOlCDyBF+ZIV9fooaO6/uylndDGkA9aINk4Pg1fWNDoz/Cy2F0RdmZznXmRlSF7nwy2alxlNUltRxNOo18fDQG64/I+5YDdz2pLuQmDQoFv2Kih8dKu1kcEPxsmyXRcvEeBxq3PM0bqPA3bT/FZ/YnJcvZkkeSJJHGo1+XPJR7aS/+BOG/WkfEeyBrqEfuZ+bzAh0mKYKBJ2hWArlbvcVIFmaaS6+2Yz6MpBavpHE0njzYWuqZfm6SO7cNCZY0UTtjUA8bIFiRRNzrNYWfA63YHCIQzcuiw==|920
--- a/Pages/项目/项目首页/预算申请/预算申请审批.json
+++ b/Pages/项目/项目首页/预算申请/预算申请审批.json
@@ -186,11 +186,6 @@
          "DesignLengthInPixel": 15.0
        }
      },
-      "19": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
      "17": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 36.0
@@ -200,6 +195,11 @@
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 380.0
        }
+      },
+      "19": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
      }
    },
    "Count": 20,
@@ -259,16 +259,16 @@
            "ActionTitle": "同意",
            "TemplateKey": "同意"
          },
+          {
+            "ActionTitle": "暂存",
+            "TemplateKey": "暂存"
+          },
          {
            "ActionTitle": "回退",
            "TemplateKey": "回退"
          },
          {
-            "ActionTitle": "终止",
-            "TemplateKey": "拒绝"
-          },
-          {
-            "ActionTitle": "拒绝",
+            "ActionTitle": "结束",
            "TemplateKey": "拒绝"
          }
        ]
@@ -884,4 +884,4 @@
      "Formula": "预算申请审批!$B$20"
    }
  ]
-}//cwwZWmZ55p/NnYnqMKlwPrFmWNECBzO/UTHV46pQEAwNihsE9EOtlqdLeYt7HbUH+3JgTnvAFGEYldiAFlInhUOUvghffwXZ58QzY8XP6fdWQIc3tifaqPbxYRGAP4VtLz34wQs2CW3qQLJcaNWf3/CSAK4RAaP7dQwQy28jx9mHPGlCd0dkiV9BUfOK7kFcp3Vszb9/3gHmk1s4R9Oczn63cOtfLXEe2cQPe1Jr2GOFfxhtMVAb5umMg4pr4Cq2rwsMb27UA44QvMc0K6S6fXM41G2mxAQypEMUFveGW81WE/CVQtbY+MJBAoUHqYySVhnq7uhRE2VofsuiXmEMCL8jjL8RLgK1PG9UsPvUF9dzaI9wM0uOsnL4opNgfa4yDW7bCoSlbBMn1QvrJZ5pG2OOesc83zRHbVrVMqJ5ZTKHeOqC5ShaT+2A+S+Rx98igH/AiAs12v33LLxmB378QmwX1miM7bA4uampRIoRG+5huRDQlRZyB/RIxOWEb8lnXfKkq9ClOfeiXaCW/lkJyL/4f9MEtti7IagRPQD1/wTdupDe3pTSdutRtitjbZ6zlT33lm3o8KRdw0K+iZcD4zDbyNLS6NAWwkZBnY1dnCbJFqTUZ4qgUOB2LJbFpCKregdB0ScJmCRYvD7uWMO+KdigEvaTTVqmyes+jaNhk4aiL4UuPwyuHDrBBQ0iHov2pLscDMPnpvVuikLRpTz4YL74LHg/qMryWPAjbFyEaudJhvXQNA5/E1Aysef1FMAaQpZvJaQkYpATUsdILWY3pgkh6AKzfhZKYLpyo6b3vY6tmxzkPEdtBb+0dpAATD36tIdtmlpJOkKoxv7icXMafrWgykAxrm8etQME9kgf8oHKEIlbov6Qnw4KksuzM9iglj1f7w+ZSQxwOUaGH+gX3Q==|920
+}//yhLSEz4tlQhf8hWm7mLttKZh4LBbHGTMhMkSywd7FNnCijkm03De3Y8Ybv3siQZ3npoexfW3o2mNwUtDn16mJKWeyTym9FHbROEWQkyJcs+9C6ROsI0tcr2pd+W3BKmmJEGBEZC5F0pzOyVPUn84lnjJPATeJGBNxHKB2l4Hh1aYh/RaXLnrucOzgcBzaxlT/LXxXOKML39Gbn9e8AZajPiX/GwR6Ghe5WlJAZA/4HVoY+62Nah2dJUrrOccsZOeNVSoD++l2LQekzMzKFWNpZp0UgbVHtz20El7HEcDeC0LxftJywePxGe0qYTjAJvm5cOIhxCY56JyV3CXsVG7UpHTWOvyQD6SBsLxGVwbzPuPdHumCv/fi8u/FTSUjjoUC0MGrRy8rUwZQFzhE8YCtyy4zl7N0SvFTTJwIVN/QKMt1er4cbYJE4hSF+NBdSiDpJVQrVLG6ld7QaKCovwLGl+IWHNoyM47An0WgA812o6mF5/KhVE1fcz0aAQJidS3rnhkRESutJJyGiFeq/WuzNzVCOC1TaluPr3l8Qj9ykbJvMPrz+uDrDblpUmTAFZeAtbrVfDIIsS1erFb4i1LRqo8IS3r0dqaPlOceNcmdtdH4FA0KxLV0nPlx6nPPF6PCU0J4ycB4f6Nbv0pX/iitUekKMOjZnyK6NAQGEmfmRdj7DbSX2nJ1gJRDJFsIKTgNtRfdovJZyotmR88skk+T6QsSKD5JCdpRBIMOPy5JnhX/dzaPyTIjjJLXcvqLXDqGOd3AVb7r6Lr9jhgaQdTzvhv4NzXcO7XjL50d+TUJW4Oe5AOHTChKBLjGM1QndoqPdD9v4tEamkQgM4pkD2/4uaA7H64pmPBExd0ySQXkhVSr5R3woYHeCN7vhC7AS2igDbY+ZgcKSarVHOjNM4M1g==|920