diff --git a/.collaboration b/.collaboration index 409337f6..2cdf8455 100644 --- a/.collaboration +++ b/.collaboration @@ -546,19 +546,7 @@ }, { "ModuleName": "PCPage/项目工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-31T23:33:48.7225806+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.rd", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.json", - "Pages\\57e644c056074f9d885f24a5bd7b4ae.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员统计", diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json index 975f24b5..75657935 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json @@ -401,7 +401,7 @@ "TableName": "View_任务工时统计", "BindingInfos": [ { - "GUID": "1220ecbd-2350-463e-8bc5-0f9b7e91b6a9", + "GUID": "d9ad2c01-0328-4471-bd5b-9d0480ee9574", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", @@ -410,7 +410,7 @@ "ColumnName": "日期" }, { - "GUID": "925c158e-2ea2-4122-ab56-b58c18ec419f", + "GUID": "b499f1e9-fd60-4e4b-a98f-962add563c90", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总计划工时", @@ -419,7 +419,16 @@ "ColumnName": "总计划工时" }, { - "GUID": "d5b407f4-0a67-4450-b2e4-8e5a8d33904a", + "GUID": "b44684d5-ce26-4696-a235-2bf6e67ed605", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总上报工时", + "GUID": "ce845c7e-f191-4495-a260-4474d827d252" + }, + "ColumnName": "总上报工时" + }, + { + "GUID": "016c9ae5-020a-4abc-acf4-975000de47bd", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总核定工时", @@ -442,10 +451,10 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "6912426144fa4151a7665384b46d6a22" + "ID": "964e381e1f0a446dab5eb6117dc69c01" } ], - "ID": "cb051dae-2fdc-4c4f-be8c-59bd2db50641" + "ID": "f51a1994-3422-415c-b1c9-d8cb22107ddb" }, { "Condition": { @@ -468,7 +477,7 @@ "TableName": "View_任务工时统计", "BindingInfos": [ { - "GUID": "e094c254-5437-44de-90a1-41090912bf6a", + "GUID": "72847545-a0f5-4bc8-b988-004a8030da58", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -482,7 +491,7 @@ "ColumnName": "任务名称" }, { - "GUID": "b85808f0-d255-4c86-83ee-7db94c0fb3b8", + "GUID": "87f081fd-d2cf-4abb-8388-9c13ea552be1", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总计划工时", @@ -491,7 +500,16 @@ "ColumnName": "总计划工时" }, { - "GUID": "99624952-d6e5-48d5-93e8-dfe0bd167496", + "GUID": "e14d7731-880b-4b53-b292-84bfad9c3b4f", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总上报工时", + "GUID": "c52b1fae-7c67-4181-8a72-83f6f370de40" + }, + "ColumnName": "总上报工时" + }, + { + "GUID": "f6f66cfc-b169-4152-aeba-2b4676959105", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总核定工时", @@ -514,10 +532,10 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "4a25d702e22141f495cad5baf9ff1a9a" + "ID": "53770253a5d248ff8e50d78863c4f3ee" } ], - "ID": "911b7787-5b47-4b85-adb5-1d209e1cd082" + "ID": "be30e790-aa73-4b6c-bd40-92c96ee5db91" }, { "Condition": { @@ -540,7 +558,7 @@ "TableName": "View_任务工时统计", "BindingInfos": [ { - "GUID": "3af9f991-37fb-48b0-a631-6dfbeee1d353", + "GUID": "99f756c9-6ec3-4786-96ca-f9b53fef7552", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", @@ -553,7 +571,7 @@ "ColumnName": "执行人" }, { - "GUID": "8f2420c2-3c5a-4d9d-8e45-ea367daf9e7c", + "GUID": "4a644214-4921-487d-a976-f2e822a341d8", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总计划工时", @@ -562,7 +580,16 @@ "ColumnName": "总计划工时" }, { - "GUID": "2feb799a-ebe9-4aa1-822c-cd5399af1bf1", + "GUID": "70b494d3-4928-469f-be20-994d7869d3a5", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总上报工时", + "GUID": "a6fabcd7-a271-40b7-b6f9-857f4696850c" + }, + "ColumnName": "总上报工时" + }, + { + "GUID": "7c2de05b-3c97-4271-a55d-15888fab5ac2", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总核定工时", @@ -584,10 +611,10 @@ } } }, - "ID": "e22633b6551e4332ae99e03268670571" + "ID": "befde364367c47c288282445d2f73e20" } ], - "ID": "08842e32-444b-4ca5-a256-c30e2685cce3" + "ID": "84bf8d75-38b4-4f8e-a056-b0500d213f26" } ] }, @@ -606,141 +633,6 @@ } } }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!L4" - }, - "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "SetTableColumnSetting", - "ParameterValues": { - "dataColumnName": "日期", - "columnSetting": { - "$type": "ElementUI.ColumnSettingBase, ElementUI", - "label": "日期", - "formatStr": "yyyy年MM月dd日", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "filter": true, - "multipleFilter": true, - "key": "abc74a0e-25a6-4b9b-9cab-4a4bad475182", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - } - } - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!L4" - }, - "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "SetTableColumnSetting", - "ParameterValues": { - "dataColumnName": "执行人", - "columnSetting": { - "$type": "ElementUI.ColumnSettingBase, ElementUI", - "label": "执行人", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "filter": true, - "multipleFilter": true, - "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - } - } - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!L4" - }, - "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "SetTableColumnSetting", - "ParameterValues": { - "dataColumnName": "总实际工时", - "columnSetting": { - "$type": "ElementUI.ColumnSettingBase, ElementUI", - "label": "总实际工时", - "formatStr": "0.0", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "filter": true, - "multipleFilter": true, - "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - } - } - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时!L4" - }, - "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "SetTableColumnSetting", - "ParameterValues": { - "dataColumnName": "总计划工时", - "columnSetting": { - "$type": "ElementUI.ColumnSettingBase, ElementUI", - "label": "总计划工时", - "formatStr": "0.0", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "filter": true, - "multipleFilter": true, - "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - } - } - }, { "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", "FunctionName": "remove", @@ -859,19 +751,22 @@ "CellType": { "$type": "ElementUI.TableCellType, ElementUI", "ElTableName": "EL表格1", + "autoGenerateColumnsByDataSource": false, "columns": [ { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "日期", "label": "日期", "formatStr": "yyyy年MM月dd日", - "align": "left", + "align": "center", "headerAlign": "center", "colfixed": "false", "type": "Default", "tagType": "info", "imgType": "cover", - "key": "e616fdd9-6122-4ac4-ac2c-e7e6f47f11ec", + "filter": true, + "multipleFilter": true, + "key": "814ce029-214f-45a9-affa-e90295802b68", "UIPermissions": [ { "Scope": 1, @@ -891,7 +786,29 @@ "type": "Default", "tagType": "info", "imgType": "cover", - "key": "abba2432-3191-47d6-aad5-3555abf1dfa6", + "showOverflowTooltip": false, + "key": "17418d8f-9398-456b-bf66-b62604dadf09", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "总上报工时", + "label": "总上报工时", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "7fe0b117-819b-470f-91cc-3d5f7bb1ee64", "UIPermissions": [ { "Scope": 1, @@ -911,27 +828,8 @@ "type": "Default", "tagType": "info", "imgType": "cover", - "key": "9248be33-cd39-4d85-9241-91901ffd7543", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] - }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "总核定工时", - "label": "总核定工时", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "key": "d2a0a8cb-6a0f-4dbf-a3b1-165603525ce5", + "showOverflowTooltip": false, + "key": "300e0019-16a1-442e-9181-efbfc788e95d", "UIPermissions": [ { "Scope": 1, @@ -1106,4 +1004,4 @@ "Formula": "项目工时!$B$6" } ] -}//ujUeyHpNGXnUYazs/nCgkEUMxbpGmQWdWKVFFieHA1IWIjN860UQWtVZ5rPPfnR3MGCjonC+4u3YVDzLtLoVpzhBRkMU3f3H6cOFR+QicVYlh+rQ61DaNp+1ExBpDeZMD1oGTQ5gpxslO+valxBRDDyJpb2q1MmefD564Jt5gpTChOFrObum0WxMg2sw8JPIKbadnMAtZYD40+rgAdamVoM1d/Jg0mLzOKfw3t1L81u2M/rgpsBAH5OCOn1fs4w/cVpbMqWnKM5btBWJxcUUxRXsKBIaypbS5WaBZM4GMoRxAJ1CBOUlHle00GXy7dL3GuiLzNdrxrqRrB8zGiI0QXn9kn9Wws15VhVoSqyDJc9wz6qDsrzupKjyp5uK7kx2qh2VVMCWeKbOUYRT9k7gmlLzFmIrM2ZeBilTMBvdTw+dPesZtz2dJh7lAy9kF2iHHk6SRARBNIEB/vpJcCIlsK6O3UI6cELV+uGTttzoSxIfV8rfDxDpH+r3tO0UMAlBvfb8Rr6YlSIzIjXyxW600Gm7onWnVe22IvBIAYaAO/TK7GVbM3x+Lce3XogvmmclokASxAT9ZaC/BZ4pJT6YxO4ooVErwk4OgB0bH7lEnZLcngAFX/2zkt8oKB+OuHrGKTn+TRx3pqDl3qzrB7/+Sqih8KyRK+Z6nnjcCKipQqm+BimgKz2SK34vh0tYiC4mD7nKimKnyXzLIuOgADsPinWdM08hVerBm1nkQTxCaq8krP7BVzfKkNJ4OWjjW78m/QUyDZjkVJ3wUHaVeUDhm1c+4JfmpVHQtCXb3sYd0WnSzgHYmgxsR47UoKJN/1yZurWmQdJZoBahi3pcSDWCsGA3XRzyQjpw1A1rrTcX7gUHApUi6O4EsX0+6+P4e2QkMoLru/na2fDbNnrGMlSsJw==|920 \ No newline at end of file +}//PnIBu0BqcJzGWTMRB4WLmQZdcm1jY/XIgbvtgxJ/D4NaIgFHaTph/iCVTtD3YjGIjT8cptoT4dI7r8AN6jjh+5W5VJ9OFYaSt++03nUwQHfeCjefwVazKeC6C1Emsw0INuS25Z3e43tFEntdDDRm0e+3pailmzjh9B/kCql7OYuvSim1y/koc8EdX3spUT5vjJ/+jj2n6btmBtinqov0DLWYvkX8Hm5j7GoJgoca9JEVLK3Ocu9ypXh4EfPVvrb+TmoILAn7k4B/cduElF3hX7UTygrMp7Wk7B0KjaPzDmotgYWmKoo/V8kJOg/l+jSBjK9R+7E2Izh4vDloZiV11I4lfQaSnNNsLMJd87rOVveX7z/+VOt8viASyC1CDM2+o1KYIFmXqqydSvmZf7L/97pmlwyfPvUiIEn3ps8fvMFYALZSP2f4n/a7Hlt33cv5LiZtG5rFFZNGqSfXOHgG8TdoHeTLqFsDq2IHdTjltG+k4GDjOzn57ol3uXX84h9gHaqFlWqPk8R6+fZk7C+RpYpDHSuHm3tlqXVfkmdkeAX5sY1g8pwbJqwb626rW9oAxERGJ3g7RR0LWcIkK6AaSvVTtAPbvYOySocDtJi828k1z5GHzrbJQRKEoJnQZz6u1d3lAkNpiDTWhjFAey/TBfzF7IxjnQe2GWY5VkV1GDX5siVrTXJxgxbQVRhl/wW+oWeNGvlimGEz9IF3j2GhtqAuYjBd4fTT0Uu/PHG5F/VHopKPOus0/HY5wTffvmtSVxbTcU6pG+X5x+i37yGYDzzIm9a4683JostyXErgC6J418gcbUihTQJxCxAHqb5uPXQjlyHDXinuG3OW7yA/3V+Gt6zwMel6MFvSWuTncTOZSMtMtbzMJtnAJ/6kS765Y9ZXc1zn978tID9fxps61Q==|920 \ No newline at end of file