diff --git a/.collaboration b/.collaboration index 78acf04e..b99c2267 100644 --- a/.collaboration +++ b/.collaboration @@ -594,17 +594,7 @@ }, { "ModuleName": "PCPage/项目反馈", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T15:05:56.1557861+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目概况-关键数据", @@ -2760,17 +2750,7 @@ }, { "ModuleName": "PCPage/反馈管理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T15:07:18.2092198+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\反馈\\反馈管理.json", - "Pages\\反馈\\反馈管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/反馈", diff --git a/Pages/反馈/反馈管理.json b/Pages/反馈/反馈管理.json index 0c140b6f..948d988b 100644 --- a/Pages/反馈/反馈管理.json +++ b/Pages/反馈/反馈管理.json @@ -768,6 +768,29 @@ }, "ColumnName": "处理人" }, + { + "GUID": "1e6f3208-3274-4511-949e-aa05e24e884b", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "预计处理工时", + "GUID": "6f22fdc1-c25f-4fe5-8c1b-429cd4af6faa" + }, + "ColumnName": "预计工时" + }, + { + "GUID": "733b7c94-3857-4855-b2fd-bb1d43bd541b", + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "报工ID", + "GUID": "af83e2dd-4cc3-40a2-a85a-d5d24c83a681", + "RelationBinding": { + "RelatedTable": "任务工时表", + "RelatedColumn": "ID", + "DisplayColumn": "上报工时" + } + }, + "ColumnName": "上报工时" + }, { "GUID": "a36d3d98-545d-4093-9789-3da674e9eb3f", "BindingInfo": { @@ -987,6 +1010,8 @@ "提交人", "联系方式", "处理人", + "预计工时", + "上报工时", "处理结果", "创建日期", "开始处理时间", @@ -1155,6 +1180,34 @@ "multipleFilter": true, "key": "6e2d923f-9a9b-4b86-acc6-918b670248be" }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "预计工时", + "allowRoles": [ + "FGC_Anonymous" + ], + "label": "预计工时", + "colStyle": {}, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "1f4bfe78-695c-4ed0-8d38-1d8d105d4fee" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "上报工时", + "allowRoles": [ + "FGC_Anonymous" + ], + "label": "上报工时", + "colStyle": {}, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "93a11fbb-580f-452e-8f1b-5d06c9aa5ca8" + }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "处理结果", @@ -2026,4 +2079,4 @@ "Formula": "反馈管理!$D$8" } ] -}//z83U1FFqjYKFjhn7FZFBl2W3gFzEEkJupXIzH7lTftHyN4QpJ97lwiObKS0qe44QzE0TBYSV4HFs80RaMP6dH23QIA7EA+2gxPjMzbAnpF3DyTO3daIWFsAiF/bTObP0TczBG9rlmbtrWlIbdzw48cU1bQ0MrDoZNlg/C0OIVSRYGelKrwyMpwaqcuUrSg7u7Fyuo6jn6YXonkd8v9cYv1Zd2ItXA5rYw4tM8adG5F782oL+SwRgDGJs6suQpZc/PG4+J3oPapZnNMO5THqIo9R/1XVcvIwdFMEcZ2m+OlNXekpQotmDcGPWQbYLy/+6PK+LZpKcpMTVrR1q7MlldQwhd+7UzIQANisQI3Sz/zHsuIM7myyxsEwkTfrmZWL7/HqUxKIROgLZmIem8WkMPFSGXhE1ashmnEVOZGtFE7P4J8e0V8RkN0P6h5Y1ak/NB/EVW+zdYl0mxcLBlVg1rGakX7Al987ns358SAIxU9WRTqbSQOoBWEvWy56OuYv/4rwKxgFW4Duxe4QSwbqKRps0tygW1m2B1n341t1XAPHSjukoXC1zBvXFaatMwH5O25sILeboLasS2bMHZg/x1OfRyPUUccpz4w0mgZG+QAFO3ksF9syhWyUe5TnUQc3v0EF3Zvh09BLCSE81ap8gTGhClA6W2jEM9DxwDFAvNPiJEgY30ZpT/+LCjMHc37RT02HXVAuYlaCv061Jl1b0eLqX1n9XuI6R2XdL+cqymnbOoGO5hys0l1jQWPnLkEo1hGYnPtLSGCP1u35TFub50TNJ7c4vzSlihW892SKDnps3bA/eM5Lz0dDwD617Rg8x+SYdcjFtz50jMrvBjcQ4OlWgc8O1TJa8qtZKbEtfbmlaowfnl6D5Hiebl5g0IDgMJPnIV/yraJ+z46e1UCAZLw==|920 \ No newline at end of file +}//SmwRjJBpN9jewwYH11rFO4HVxxvJx6lVat0shDcVvlcSQaCOiL0xtXWZC25j9Wz0BXbtI5mOxDm35SYLdo8zhb8/roSms2OGdNsEiSkbeZ/6xtSdmVTqFXjJowDA3IxtA0RL5ULRT/zWebdf5A72SrvhoRBrFPdRppDQ5MTGZr4iI3m5aTyhSFhHJd7D+g8h4+2iOLt2+MgBzd1Db/F7tzACZtjt9qUjTKS7XyjziCr/Ucrop2vwWGplZO0nlFyIQMCfNEwi+wbjd7gnG30USwKExTB8CWTvRe4dPEo2f0BmuYC3zF5VpT6zVBAmKI2oz8IYlp/OzPyvCwIgpqxpMfyOCnAYOw33W22JAf9RZdvsmknkeEgx4WoO0CC0AbT5J03NxU8VP46y3RmZdZgHReJRnK+BT1zcy1x4r+sQ+kE+eqdB6D+8muVaDyeXhfesVmqZgAYI6kMQA4fa9spjqx/Gg1+M/3ujXPGXTbBmios3QvDeXbkk5E6dA6icRqFMoIFq/pgH+AnfYuoLN0hFTkp8ndQhBm6MwJILnlW5Hq30BGzk6T8i5aGui+mP5L/RDM2xaVh1ojJ4kK/o0EON1vjFvhi2Qpe1s79IM34BrOi6HMDOdt2w7zU8vA/S+PwbOXX88uiTXRoKor/CXsdhdBvNipJn8dNKPRLFOTNEno30z7piX9s64f6iEyd9ka7yZQyOK2L/abmUNOXrEtyMvdcvcXcHvg8OB+H3z/O5bu7NzPnhivSzcrPQlDHAVIkwjDNDnlyXIAfi5ZgpEFsUI4acpmD2uPn/bRgyVqLF3c3PH8bKtyHu+DvBftIeE4nuCoj1BKTkQlHOtdJEUj2XjwCf2q75tpt7SFg/20PmprN/7FK/6hvCugpsUcxeFRTpTt7UMdXB5vxh6UvAhcLOQg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json index 03caaf26..76e35b05 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json @@ -742,13 +742,18 @@ "ColumnName": "预计用时" }, { - "GUID": "01736391-7e1d-4274-a2ca-c566b8205e62", + "GUID": "8fcb6e19-836e-47e7-8691-cf00da9f8a6f", "BindingInfo": { "TableName": "需求反馈登记表", - "ColumnName": "处理用时", - "GUID": "a3e6340b-a787-4799-8a3f-51e2dc6529c5" + "ColumnName": "报工ID", + "GUID": "e0d46e55-0295-4cff-ac3e-1b5e2f89ed3e", + "RelationBinding": { + "RelatedTable": "任务工时表", + "RelatedColumn": "ID", + "DisplayColumn": "上报工时" + } }, - "ColumnName": "处理用时" + "ColumnName": "报工工时" }, { "GUID": "2a2a5094-9edc-44d8-9f0d-c061e2ed2398", @@ -931,7 +936,7 @@ "提交人", "处理人", "预计用时", - "处理用时", + "报工工时", "状态", "流程实例ID" ] @@ -1060,20 +1065,17 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "处理用时", + "dataColumnName": "报工工时", "allowRoles": [ "FGC_Anonymous" ], - "label": "处理用时", - "width": 120, - "colStyle": { - "horizontalAlignment": 1 - }, + "label": "报工工时", + "colStyle": {}, "colHeaderStyle": { "horizontalAlignment": 1 }, "cellType": "default", - "key": "30b90f95-0ecb-47c3-a4cb-000730f814a5" + "key": "abafbbeb-436c-432d-a343-864ef5bb6c11" }, { "$type": "ElementUI.ColumnSetting, ElementUI", @@ -1376,4 +1378,4 @@ "PaperSize": {}, "Margin": {} } -}//3YEWyELf1W6lyENJI4I5gJQZ6vY2KrKRfd2x4YO1IaglYwGxsIeaDhUJJuDMqXgfHUEzGPVHXLZipZFWis6jeoC0QjhNQQowpvks8JMHLxMOA8HOKnizykEfkMbO/NQaP2GpdVi9mGhnx4YannQ2UYm/XwMEUS/fvAOPaZYK2BzG8IZDJcHErYZo6uWCw+SZNNuVnLGto/NYdya7BO91eXjNyex8MOxRxgBuOhuHm2R5sbUdAnzH1CZL+2wh7lyb3ts6zEpDPRSx1AltDy7/1rQFHlXhQVLxbmOht1Jr7CHDmPI44/tuEhhn798I3+nR8JoIQ2b0uuP5G+HxXLcNfUNCcTz49bddMiXDu6//KPEiFQBWcf88733xPLFvd4AolhOBUyBqOpJYQHiSkRyJrGnqLUzNMHGhvuab3DrASF8subL7NWYRZxcfNeuircahP29f2IwL5ugL86Z4nnO54cfC0nW/7SuFRCNgQ4xoL6ObAHRh2CVvxVxm7MsFoUxzYuDM8pmfH93ALqsbpbinrfb/SdrzNhEZV30SabpTrVfqNT2ZP+Q1cOPWbNiwhspSeF4HjCH7CUh+5I+7Wxz2ZkFVZ+nbBnsqkiQ9pirwU7sX719DWteaMZn/RUxPx7+XlaxYN8UMc4GG3dmAYd/UUSsjHVlNZhcGLxxO+fTSnm28Ea9II/yMlLzGZ/pyQ6981b4owh9FGzDTABWYrxK1hyKB0913tDsSxPLKpAGpqDBeUE/SWj/8uyJklWBbf4Az3e0/et/75IuoL9AHQjbJqrU7d+qBa8GBkq6I6rviTiYzirch53vDYNvxcOx5bx/C3hYMY43ZEmu4x5aAA399BE6WT/BeHen5ZoiTbuf8wqCjh37Nh9uQpI6cC1RkF0QMa+Kp1uwI8w0orDpWXtuCGQ==|920 \ No newline at end of file +}//a1nzcmrWXCHqvyyZZu+3w/1VyHHDwIgHghdl6lLDbBLq4g/ExWXzuVsfNhshE6nPaYoM6ULj5/SM9srAF/0adyvvvzix9GqVHNaQb5WQY0/pDMp9bYUWwoO1EcizIld1myjNzAqr7MWtS4zS7JQE+vXkyBDXrZ1Bq6fP50HpszX40b++tQsyugevtBgieEsVAosEJZZ4jhxtJMnMttHTnUievmHZPLgnBbGB0wO9N2evijdjVW6QOwOkexboyfV9iuZuuv76uZqT4qVtqfob938tA/xkj0kUsZYGyYdYcM/pl3OOp79HK7YtyySE4ZSL2FXKbPMjD8QfiAC/NqA+k0sjs689JqZHPhXfIQE4t6YLxhcYxkKiNzOAVRJEL7x5+/fs9cn2AwwQetryVwl+L46EpQn8qfOJBcTVJrIwsjTWK4u1fAlUQ2XBEG2ufMalBsOUonKB2zyNfV41jTtT7eWlaEj1XQuW0xAlOK9f1AYAQXkAa8uQ+UgZDsK771MANBwvvqXeOv4vBQnlgYGO3Un79WwkpBMsxMKA6svGKZU2V/LLiPY3tRuKGfrpAZuhRX1CkXImMx94J12fMsOMQO+KYJ5ct2tEdB9J0CHzagLAOe38oKjZ6m4bZPdrWB7QWP/DgdOPLUkgfnmaFmFo9FO6OlQ5+ERul3HMG3oBwmWr2YtjKE2a//bHwdheX+1sJPW+PK3BN0CdnWJKenehZhjehSJCvLch8TaYD6V3KRtrGjNQdgCN2r6g2mRNbEKQqVw4h6FFiRi7FccIsXqSJgxAgnQx2mHIcIKGDstaQlev8VAuSc4xAB8RJPfSsPG7y3vJsMpvKnN5OTJKVnP1njoibcW3iXclibYzNrmE5SVAPFBORGy+kfLEUOVn6n7EMZ0fuwPzxXBRhweL8a1MrA==|920 \ No newline at end of file