{"Message":"1","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/任务工时表"},{"State":1,"Type":1,"Name":"PCPage/项目工时"},{"State":1,"Type":3,"Name":"MasterPCPage/FGC_母版页"},{"State":1,"Type":1,"Name":"PCPage/工时报表"},{"State":1,"Type":18,"Name":"RdlReport/工时报表"},{"State":3,"Type":6,"Name":"Pages/财务"}],"Version":"v1"}

2024-03-28 14:52:31 +08:00
parent c8bf0412fe
commit a70c4925a8
9 changed files with 56 additions and 154 deletions
--- a/.collaboration
+++ b/.collaboration
@@ -69,16 +69,7 @@
  },
  {
    "ModuleName": "Table/任务工时表",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-28T14:27:10.2212311+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\工时\\任务工时表.json"
-    ]
+    "ModuleType": 7
  },
  {
    "ModuleName": "Tables/流程表文件夹",
@@ -479,19 +470,7 @@
  },
  {
    "ModuleName": "PCPage/项目工时",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-28T14:26:35.5007215+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.rd",
-      "Pages\\57e644c056074f9d885f24a5bd7b4ae.json",
-      "Pages\\57e644c056074f9d885f24a5bd7b4ae.rd"
-    ]
+    "ModuleType": 1
  },
  {
    "ModuleName": "PCPage/项目成员统计",
@@ -547,17 +526,7 @@
  },
  {
    "ModuleName": "MasterPCPage/FGC_母版页",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-28T14:43:32.2999033+08:00",
-    "ModuleType": 3,
-    "ToRemoveFiles": [
-      "MasterPages\\FGC_母版页.json",
-      "MasterPages\\FGC_母版页.rd"
-    ]
+    "ModuleType": 3
  },
  {
    "ModuleName": "UserControlPage/工时记录列表",
@@ -1212,40 +1181,14 @@
  },
  {
    "ModuleName": "PCPage/工时报表",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-28T14:50:16.3267547+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\工时\\工时报表.json",
-      "Pages\\工时\\工时报表.rd"
-    ]
+    "ModuleType": 1
  },
  {
    "ModuleName": "RdlReport/工时报表",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-28T14:24:34.1150907+08:00",
-    "ModuleType": 18,
-    "ToRemoveFiles": [
-      "Reports\\工时报表.json",
-      "Reports\\工时报表.rdlx"
-    ]
+    "ModuleType": 18
  },
  {
    "ModuleName": "Pages/财务",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-28T14:51:38.9901831+08:00",
    "ModuleType": 6
  }
 ]
--- a/MasterPages/FGC_母版页.json
+++ b/MasterPages/FGC_母版页.json
@@ -199,7 +199,7 @@
            "CommandList": [
              {
                "$type": "Forguncy.Model.OpenActiveReportCommand, ServerDesignerCommon",
-                "SessionGuid": "eeb52fc5-ed99-45d4-bcb2-f559ed8f8487",
+                "SessionGuid": "48934402-74fa-42fc-b180-94a196012909",
                "OpenReportName": "工时报表",
                "Disabled": true
              },
@@ -839,4 +839,4 @@
      "Formula": "FGC_母版页!$A$7"
    }
  ]
-}//MSc1l884wzZUuYEBe+n1kp2eSD80yU6naHVyV1m88FGFYeWPBKwdetaKidkkNBvmE0IXwcQ3c06bhKZITNrqUWpVnc/rVbDVuaPIQNpSQroJlr8etOIG684y53/MarbEkxX4sd/SVo2UDJ3pIZYAH4CO0TBwlPclue+yR2nwe/GAT4Rfi6ATiqaDZ6LLIivZOsQQN2sN94E/ib0LQA0qHR4b0l7a2MhRWXrFGcrCH/8udVyPRl1ZCyzshw/AsN/uQSzpsXvTqDGQEwDn/u1FXMAR57qge9o1GXOIxX9TU9Z2Zk8BN8mgkcayh6L9o2JzlPS+7kKUBHg/uxa9D0fyh6p4y9jo5IKyqmptdgYGMg2HWfCX5zqJOYjiVWElToHZmwaWK7+L6Q0vjjmX5cHqzuSg2+gPWandr4LQoElFPGtCBNeJ13oanCYSdkbmOSa4ARJ+AfGbX3kaI7LNSowgVxEZtuRLpfIJOiWn5fl26lZkRkH/GXuBh0lYi1st2TDMmkV+sHrPLEI4rTkAS9DIAp/ioPovbJWGAQ8LbWCcfGnOgiHUDNiBY5ejUHvvcQz/68gf9T324Kx3MQ2StO5jasRqnalFqaYV1oz0IyJPTk9MJzsdc+RU9od47AcZjrSnz8AUWFxYqilUSH6SI0vDsNizQ6d/CdJFnuc0JkK5hkrJg1h64oyFyKkx5BKJo9K9+emrHexT0t2DbDCjIa72D1X9vN/S6iWSzAfIFstHpu7Hf9RFQIv5Nd4KKDEDH73BXXS/WwD7RsdNsg2QzQtVDSjHdvyAWDyL60GoymaSlZnQGfqE5NS8Go9XfXIpRI6U2NIh1f/IET83L4Hf/C94/4YKMM1A1bh8H3rSYcyqmtYovrL+zM0+PsP8XSTFQ32XUtFaua3t+su0wsuywNKQJw==|920
+}//RtrAduneB00t+2oWGUGeZzyzN+IsPR2vN9yeYylXQRe9CBeDFN2ba+2PHUC9SIgs86ftyOADW1Mmjj0Dvxgd+FjOFnF4uc40yR6mV3VSJ9rzQ0U2oGiLXZbiRQpcyHt+PyEZJobpdjCwKcdN5N0Nf3BNMGzLMwnRtHoMgfrLKuanXPvFaVy0/I4ld5zBrjsMvoEXLYRHl29xmHLVse3TCM4xQpNJtVaDsaQRLYoffrN6z2iitMMUx7DG3rBNn/dKMC1Fij4W+nxe8WuAOVQeS3pilhxgqiBGeKEVl5k2rx4v7PyY8PizAC99xNIJTyQ6i4a/2sZm/B1AZ4GGIsmBy3xqFqitVXN0ogHWN3iIjPUA3GofwGOHGa781ShMHabSwkdTrvm+l1LDLtb8CXo/HMntbJF5GLhx9Q+b53ss0/9acatMSKJOCZkkP6/Jz5GWxZuGQpyKHkgz4Kful5kWbrqgNtDf05YxM8cUF92j6dnTk1Ti6vySQraTCFtu9jf0ki3gdFB9xxS3OMF539s830zfGEh3j55tApb6Ea6Pu4OSHCnBXcAr7wEXayODO8xLnrpZkOGN5ekQDHSV0o5lJpg+KdhxVqc9NBQO5j45MfscbVJWkKhR7jt4R2k/2QPTafFavb8hoU/d9rX0tDleDSWoXBT6lzA8laQLLI+2FzWgEvtlXjp2/qDshEHj0mVxSf9N/UhyrtSj2er1jnioG5inNmL5GB7y7roG8P8wIHC7Trmf72IHv0VEACQcR0mFUOJmv/jbPIzDboEKwMgSSjK8qYJtCqmSfyKt//XZ2ty8bvV4THZgFJvLbJkU3pz3VrqmK54uX3WxwxEZAnokaKETN3XNhM6W4Tniiv5Sa/2uUYOE6Vm8akFt5LNpjhL4FmyDRhhrLsJSObL7fUnLHQ==|920
--- a/Pages/57e644c056074f9d885f24a5bd7b4ae.json
+++ b/Pages/57e644c056074f9d885f24a5bd7b4ae.json
@@ -22,17 +22,12 @@
        }
      },
      "4": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
-        }
-      },
-      "5": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 10.0
        }
      }
    },
-    "Count": 6,
+    "Count": 5,
    "DefaultSize": 10.0
  },
  "Cols": {
@@ -65,8 +60,7 @@
  "Values": {
    "1,1": "执行人",
    "1,8": 0,
-    "3,1": 0,
-    "4,1": 0
+    "3,1": 0
  },
  "AttachInfos": {
    "1,1": {
@@ -77,9 +71,6 @@
    },
    "3,1": {
      "TemplateCellSource": "平均时薪"
-    },
-    "4,1": {
-      "TemplateCellSource": "总提成"
    }
  },
  "StyleDatas": {
@@ -101,12 +92,6 @@
        "Foreground": 0,
        "Formatter": 3,
        "HorizontalAlignment": 4
-      },
-      {
-        "FontSize": 13.333333333333332,
-        "Foreground": 0,
-        "Formatter": 5,
-        "HorizontalAlignment": 4
      }
    ],
    "Types": {
@@ -115,8 +100,7 @@
        "0.0\"小时\"",
        "Body",
        "\"平均时薪：\"¥#,##0.00_)",
-        "Left",
-        "\"预计收益：\"¥#,##0.00_)"
+        "Left"
      ]
    },
    "CellStyles": {
@@ -135,8 +119,7 @@
      "3,10": 2,
      "3,11": 2,
      "3,12": 2,
-      "3,13": 2,
-      "4,1": 4
+      "3,13": 2
    },
    "SheetStyle": {
      "FontFamily": 2
@@ -145,7 +128,6 @@
  "Spans": [
    "1,1,1,7",
    "1,8,1,5",
-    "4,1,1,9",
    "3,1,1,9"
  ],
  "PageInfo": {
@@ -156,4 +138,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//5+Ieatrr6LJlpn2HIuAwlXygZgT6/+tGPJutQTy4cBVmZmO9/4UltUxET2ompDoci471m863x97PBv3hIH+vkFD1SqRQVWYNfomXjWtp4BQztD7+dSnc8X3RgeWH0SgoMR6WfR/nQ1rqiJpBqm/4EMN9QMdteDPPxtO3bIiJwVNO9BhaGja9EGLQULfpq3pu0x6+WuBC1an2McDQOzn4OrOK0Nn898wUXgnjKVpfpbN0D1HNO5vUj4AmLWusnTyOndjio92JpTHIfJKhwMqRFgzQ2rYlabQtQSduHFcu7uessA9qmMG9INJGSWHuBRHAqBLvazzBh6NwNme6jUHFv1gPEA4OSjp5qsgk/Q1arAZXQlHRcdvJueFvM1gYD1HO+K9oMqNNAyIpW70VpJDJbJ5Oj7/vBPbPLoQaUtATPcb4loESBKqOC5mGYm8mMkdT8R2l9dx5TNFz3zOgsWbhWLBvjWHz5IgIZH1VgPHGn01BPH6IevPKRJWW39oGtIik0w6J4mgT8aE7MD3LMB1PFW2OUKzSY7fZb6rN+/iuDro5MwIUD24yh7hjZuJ+bp3UYQ6Aj8q3EW4Siz6rjGNvHKRv9hvd6mqSG+raZPEgKlvy7SIpyNYt9U0GTrAGkUmh7w8uJeEegv6hKKD2Zjk6sVhRlLGvZBx7nm9srIVBfhJsIHpyT76UCKlx+bytsi7xrol4hYXjk0uNDpZ5oIgf/uJ32S4Bddau0e1uGNSzoV2bSbpXV3GlmYLiYsZItCRh4dvV/sQ9cXmK+mh7bGNwROrIEWJbsjoHK2qx5sMDxNjCIUlcTaKSfNLzMrZvqH36+BRMkG3Wn5bLt/OMyngSJ/Z7O0BhyDA5AuMHGp5nBiwGgf9RBVKX+UJaylsuxQwcQpVwXCCdnOLN2lJEAxsjtA==|920
+}//F0EW/3HeLoFsPoAxe6VfpGNtPrsMv8tp1kZofeh0AV915U0wvdLfOBPk4wPnEuUF90x/Zxh/Jx5oTOyl912P1maUDnqWq1gyA/27Mo8jTxqb1mOGAqkwE5YlTqyDw7N53GFJaDn7ZPVg2RFgubQCz2Z4N50SlptTrdJ7U4mud0QntEBnyE2mwoja+V7usxEql03jomotdtBffHP+JMh9frt/cN7ujSA3RtVg1su9Mo5DsJ5SQZEJ8FpSmvSkMmowU7jjtrconDMrx4gI3jnaqo/MzAQH6fjXrc36GnS7mIjZr1RaYbuZWfNfQkLmbMAeojVpg5dlgNouXCBr6dfmFltzaGKvERTl3sQMsXVpcWsK1Nn/wlkm0A0Zlg8MZwC8iyhAmrSRQBhja176F2MIaXHO8JnNvXx2eBGHEl/joFEeFHWqM203tma7BhdVbrwEOnqVYxPOZUHkSFhteyJGIBvEcNzoiuNQabPo74O66NSvLW3wWgDRSaCX+OiizwP/rqNW/uU+9YziOX4YQF4nNh1tb3mkL3LvY6oEfWDUWkvaQ9cWkqTHFQFFK+Jhq4lIz2pJxBv1vT8qzlCeZVmuRjKxep72pK4JDF6WI5FQR587iB1jEWo3AquKkx1UoFaSaQNRRKoYZbq2BqMcWYFoaS2S5f3ml/CqCay5IFHtNnPFY9ruih93q3NCazr0la9u3CNWxJXg2UMirmt74cUDca9x7bWQMgrt2o1D+FdhQb/DVu/7peVYsVTryZMl4AIwKUtHE3QPUHt9og8G9WGuqU+8eeNVHoxCT3di5MkpX24hEd3lVPUy6EKmN6E6mbbUAostwmaYfokUB46a75VKFzm5dncdN3jy0fUFqA++CrtzSnMQUgbb4dubKxa2dCA/ofpzwEzRrHle+bbVXb0srQ==|920
--- a/Pages/57e644c056074f9d885f24a5bd7b4ae.rd
+++ b/Pages/57e644c056074f9d885f24a5bd7b4ae.rd
@@ -1,5 +1,5 @@
 {
  "PageType": 2,
  "ColumnCount": 14,
-  "RowCount": 6
+  "RowCount": 5
 }
--- a/Pages/工时/工时报表.json
+++ b/Pages/工时/工时报表.json
@@ -90,7 +90,7 @@
        "MethodName": "Load",
        "ParameterValues": {
          "Mode": "Page：当前应用中的页面名称",
-          "Target": "ReportsService/preview/3006b5bc-1ffe-41e3-964e-1abf24c8c552/工时报表.rdlx",
+          "Target": "ReportsService/preview/ffdfa71c-6e06-476a-ae97-9896f258ee37/工时报表.rdlx",
          "AttributesPairs": null
        }
      }
@@ -116,4 +116,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//mNjmpWwugcSGJfoxIHr3r/xkFtwiuvJcjY2oPKKA44RbTDwJl/zCHO1bgWFY0b/X66yAHQUrKFJ09WGl5UC7v1kSeEd0lyf0bjUa5cVmHJoAr/nLCZcYQb+8blZuIUe+UB5LG0nUpoVTWGgm8KJ++iC4tA5Q7EiGw0KN3Z6eRHSWVt962UuoRFi+fwPTPWUjoKQf+5W8wDrtrHVD3o49vWg7fmQPHYuHJyfVosEQDI9VycAEd8B+AbgwCMkLEDHM7qOA0I25977WzIQ7Vb9gKYTfgVW8dtqyyBhPNLWnSr70xB7ChN2oPyiMo3jpGa272gvlIqHb0RZUM0XSG0etKsceeXUqepC6RDkwYZhGvwO/4Nl/d7YGUAux+rKkZcw9Yba39QxsWA4Fya9ZxERm6l+02EhWofytIInWwc8MDYBZNkZd+BeJSbb9kjDS9AybMdw1aEf1SValYGOKL7bm3sWNYlcbiYRPRwaVnnHoxdiFmlLv6uW3V5TxDqTusrNGGLwIuFx/GD6EIQsoKXpuxdTJeHnNv0Ytx7yexVwMvTQ+9+7aU7jQ8A5XHqWvfI9rFf2NAo5R3ysrQ96Nh1E8uJDfCMYIdfcHU2iIdSJ590ZSal7kD5WVIFqAhb8nGX/n4EYB6hA/Wqi0xx+cGWiE0895O9/CrcK74R6Zh80XQeYJKckcskBwETgqW4yxR1SJqZDSPF7PjK8Bpc+rJdAE32TmyCUDs3STjfpv7qBzXO7zTRW3LBOrnz3xuwQViypStI6svJxY7o3dlnLYObWqFgTpXL3WJeMMs+QCgTqQuyUtQFCWpYuk/m+U1RUS+vq9d7k70MDDNwNW3IPfnD8nki4nI0VnlTqLbADfhqPKbRM78JcgDTxKCzpvaQwQieF0lkPrc3nPn2iNg1Nr1GOzXw==|920
+}//lXav3V1UzDS5c8XNu69+Kfh1lUu7FcQ2j6Vd1MhR6b5Oy1D4ys0Ns5d8Ydq4f18kNStEgvlv/LZJyX0StAkyKyx7TTXlIFIQktqVa6Lm8tzqKPdtRHmghmKum1U+2+q8qrH2CNgyPyvS1kv1m78YcZjxkdRKaDCfgNOq8jUp3FZMV3/KSCzyICXLQvZCgO6vvc6F2qsRw6q6yJ65FPZyUZhZfAPlvBadkHcPRx0py/6XKAmfd+BUhayakDXHPb3OL6V6C2gbElyi85+1vVc++ACmFOLkcvD47y6Q9Be/P2YWDBqPLbvkqJBi+70le9pjpzexhyVnFncl5cUu6nVZQtirM3qtaFB/1favVku6jjOkczoJFKNiLjFv6z8qFdkwTMYc732eNBSi8b7G1ZZIa+DP1IyQtKkSrQEuaLTh74YST4IGJeWGAOKlyxW02inedAQzKrsmNEicXKF9fwPAfcNR3y9ubi6uXVrmQePIOFsL24JQxkkHZ37Gn2+QjO7cGPJNzeg+MRNhQ5gHB/JFp2knK5bl/oHAXRVRB0kkKJ7vNyVA7MPe3igqRZ1G6jfu3CCN34j7KfvoRLfJE/xAueyClR1kyhKpDVv/91Cx7Dmiu9P1t2mhsj55xQyyvzQ7biWRB75sme81hgHDZaYxKwhldY8VP5ICpQj/wiUzVEL3+9+YkOBMkFuo6QxxoOqGmssnb1YJycgXP2THi1MVK2gsUHbfLmzOih3LDTw25dlzXmLpvSu9T7Ok9B45bHR2/5AUszkieX3zKwnRT6rAiMkH1Pj6Kli5O9mARudyPXWk4K6YBb364yWHYGhlbrhAaPsrIzu0pdQTQXVVUbRp6rJ4vSJgD2mz+TqE3Ba957MDhaSO91EPuv9Z95goU6iF+JAx9SJUKLTbj9cAu9qKGQ==|920
--- a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json
@@ -799,14 +799,6 @@
                "GUID": "ec2b99a7-bb48-485d-a4dc-cfbb360e3bad"
              },
              "ColumnName": "平均时薪"
-            },
-            {
-              "BindingInfo": {
-                "TableName": "任务工时表",
-                "ColumnName": "总提成",
-                "GUID": "cb5a3cb9-c29b-45ce-9854-603dfde081bb"
-              },
-              "ColumnName": "总提成"
            }
          ],
          "OrderBySqlCondition": {
@@ -1010,4 +1002,4 @@
      "Formula": "项目工时!$B$6"
    }
  ]
-}//QTKd87+tZN+palbm2oCmBghUKQlHfV4qSoJfhtNWAv9zi/csLW5LxaGejkg2buLSBNI36gRpqAohR3gFsZbp/tv/PF4njcGLOgEu4jXpbGnNAVJlrRVfdQn+5mYY2lJTwxah+TRq2HQrrCY8hCHGI3/Y3lkRDAJhqO/X4G/Gs529anVA/2Tf7xS+niBiA0ri+x+/pqFLJU+zUjF3c7XV43yuuGIuNGwuQ4swSTC0NHcqyn+SOk6UYemzZUM7D9U/81O2I0TkqGfHhj4iKLmbSICA/Tkpv7WTUqnBXJmnXiTRK0alu/GLOiLt3vmZs6OklccZFXvNWVlyJ8kOeDwt/vgJkRbv1bwcNOlC4j8+ilQli5yWQs7gCELSH8WgC9/bpV8BFq9UIWmdEEoCdX8oKitI4Sqrr9MJYKQl1HXUxbj6XwITCauU/JbL/7EXcwV7dE+Itj45PZeEhx/U6+SYJtyxf+XHnrXXCIOPTXc584tB9abiaCJYz1sD6/hZnNkv8EpQNwpMZZcz5ggl7lPY4DbvJUiLLoagjDcsi91+XbtAGD2EwAq7io+JYLewIj+B1GUZlaTUdP2dNv5YWZG7wMqkzXQ89ROVAWLDppVihjDIcJiflZ/zbehV5pZiNZsEUUzOU21O/DDmgivTSA0gZAabIPoCZMLuwv16TGcex0YJHKBlK3/TyjIhmkYIfaMcKjQf2EBqrOStMXS6erHXPNUexvPvWGHOZkl0cKII08RJKE8n/BX9Doydn8ZUTXqILtJl0r0OKu9qlcBnXHNeKF2arAN1tnj8KY2fFV8oe8Rb1izmK6STAbv6OkIDvHl4jdGJNdn8PSrxGFEujRXxkWP3uEoc9MydyiS/F5tMjoSx+RRt+QbmG91nrF4E64+XzTzVVKCMiLQKgsJ9Uw1K9A==|920
+}//Sw7xjXbhcIWeZplBVx9+1bAftNIMgu8daicF3UleBMKPyQqEYpbDPUhQLR2l6yLs/1yTYljmntUwtZGw+Y+aqJ+6MhqV1EM63ZnNCXbyyOar07d5N6VMjLzADGWcScw7ZTYjKWwDVokri/1Hfgxl7jElisE1L2G7/37b8Qlzw1HAyfOdYJOqdMJj51OVIw8NbLIkpyViIlclSLIRiz5RvDzGzStWA/Rcj1l6FYUmcErYJ71kS5HhbFRAjKBVw6CyCrsqMfhmyILmyBLVp2loqD4xuIGYcmk2KI7eAc3LoXD7oXVgCUqkyzQnvMqHr7Hec0zSkRZnV/9Ub6wrsSkgjc94PBFBvvUEP3sq+wXSHqAsrWvf7tEd4SODIY1KGcXHh5evHYw2YjAk9u676Ivp4dTuNxRTMomt3EV8vQm5KrVguzQIwqgowv4q7lYQkBkDbRcMoO+M46Du3wBkXz8dILW+D+YTQfKyqchhSMebdFtO2oDupsan3jtV+bxtjcxbTN+OA3MUV5mfFFBKZ6/yklj1XsFO5lJZxoy49n4VRIkrE19yGWjCcLyj8Nb72zWWtywgodBdPAIJlnKhdKRxml/GnxhzugEdBO5ruB7mtNDhSEsHD+mwsiUaN0uEAEWWGX87YHZqgWQmMQbGJj2+KqlxES1a1XOkVNfb4zVpSSioi0peBnvtnfthdwGhLgxClIC6ogMb5rBTxSWeALjXpcLkfTvxufhELM/9+qe76gVwBRCXJTSsL/xtOzggU2zNDxLDHiLnzg4nd+35Wvdvv6DwJoM8g+PbSWc4f7K9X/sLd8z2My99Ikfz6gS2M0BGo9bGypGKxKqQf4cvYIb6Q5wi2PleBPUOr6eaD+5nenmtyd1tZPuypStc2elAbRieGFvU33QSI1uLrEMxQbElAQ==|920
--- a/Reports/工时报表.json
+++ b/Reports/工时报表.json
@@ -2,78 +2,76 @@
  "Name": "工时报表",
  "DataSources": [
    {
-      "Name": "人员工时统计视图",
-      "GUID": "81f80028-ee1f-438e-8213-052881e70f5a",
+      "Name": "工时表",
+      "GUID": "eaf0055e-b7c7-4fd9-9f79-abb67577832d",
      "DataSourceSetting": {
-        "TableName": "人员工时统计视图",
+        "TableName": "View_任务工时统计",
        "BindingInfos": [
          {
            "BindingInfo": {
-              "TableName": "人员工时统计视图",
-              "ColumnName": "执行人",
-              "GUID": "4885952d-309a-475e-ae29-086762677bf3"
-            },
-            "ColumnName": "执行人"
-          },
-          {
-            "BindingInfo": {
-              "TableName": "人员工时统计视图",
+              "TableName": "View_任务工时统计",
              "ColumnName": "日期",
-              "GUID": "370ec46a-f7fa-4a77-beb1-b9043d989a22"
+              "GUID": "c3ca6f17-89d4-4080-a320-bba11cfaf96a"
            },
            "ColumnName": "日期"
          },
          {
            "BindingInfo": {
-              "TableName": "人员工时统计视图",
-              "ColumnName": "计划工时",
-              "GUID": "5b5bb019-9db5-466a-aa74-717484c4148f"
+              "TableName": "View_任务工时统计",
+              "ColumnName": "执行人",
+              "GUID": "887dd194-cd9d-4c48-9dd6-0eaf343ff7da"
            },
-            "ColumnName": "计划"
+            "ColumnName": "成员"
          },
          {
            "BindingInfo": {
-              "TableName": "人员工时统计视图",
-              "ColumnName": "实际工时",
-              "GUID": "6f6059ab-b3f3-46f1-889d-981f920bd387"
+              "TableName": "View_任务工时统计",
+              "ColumnName": "项目ID",
+              "GUID": "58a96f0c-4abb-46c6-b34e-4b4ba6f76dad",
+              "RelationBinding": {
+                "RelatedTable": "项目表",
+                "RelatedColumn": "ID",
+                "DisplayColumn": "项目名称"
+              }
            },
-            "ColumnName": "实际"
+            "ColumnName": "项目"
          },
          {
            "BindingInfo": {
-              "TableName": "人员工时统计视图",
+              "TableName": "View_任务工时统计",
+              "ColumnName": "任务ID",
+              "GUID": "825456f4-f846-4a2a-a415-3920d7d4be48",
+              "RelationBinding": {
+                "RelatedTable": "任务表",
+                "RelatedColumn": "ID",
+                "DisplayColumn": "任务名称"
+              }
+            },
+            "ColumnName": "任务"
+          },
+          {
+            "BindingInfo": {
+              "TableName": "View_任务工时统计",
              "ColumnName": "核定工时",
-              "GUID": "db9c1e97-e7b0-4455-a80c-9e55823a3323"
+              "GUID": "f01379bf-61f7-4c3a-bbd9-b874900f0ae4"
            },
            "ColumnName": "核定工时"
          },
          {
            "BindingInfo": {
-              "TableName": "人员工时统计视图",
+              "TableName": "View_任务工时统计",
              "ColumnName": "计算提成",
-              "GUID": "eb690d51-a3be-4a39-9040-8cab780d936f"
+              "GUID": "bc6c396b-7605-45b0-961b-995d849fb135"
            },
            "ColumnName": "计算提成"
          }
-        ],
-        "OrderBySqlCondition": {
-          "OrderByColumns": [
-            {
-              "ColumnBindingInfo": {
-                "TableName": "人员工时统计视图",
-                "ColumnName": "日期",
-                "GUID": "4ab1cf8d-2028-4e41-b9b6-6d2e82491f29"
-              },
-              "Order": 0
-            }
-          ]
-        }
+        ]
      },
      "ColumnsType": [
-        "string",
        "date-time",
-        "number",
-        "number",
+        "string",
+        "string",
+        "string",
        "number",
        "number"
      ]
--- a/Reports/工时报表.rdlx
+++ b/Reports/工时报表.rdlx
--- a/Tables/工时/任务工时表.json
+++ b/Tables/工时/任务工时表.json
@@ -81,12 +81,6 @@
      "Name": "提成系数",
      "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
    },
-    {
-      "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
-      "Formula": "[时薪单价]*[工时]*[提成系数]",
-      "Name": "计算提成",
-      "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
    {
      "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
      "AggregateFunction": 4,
@@ -94,13 +88,6 @@
      "Name": "总工时",
      "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
    },
-    {
-      "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
-      "AggregateFunction": 4,
-      "DataColumnName": "计算提成",
-      "Name": "总提成",
-      "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
    {
      "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
      "DataColumnName": "时薪单价",