diff --git a/.collaboration b/.collaboration index e418c970..992889e8 100644 --- a/.collaboration +++ b/.collaboration @@ -1153,19 +1153,7 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T01:12:27.2326036+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报详情.json", - "Pages\\汇报\\汇报详情.rd", - "Pages\\484d3ed119274a60bf32f15d178cf60.json", - "Pages\\484d3ed119274a60bf32f15d178cf60.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Image/展开 (1).svg", @@ -1189,22 +1177,10 @@ }, { "ModuleName": "Pages/工时", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T01:08:12.8241105+08:00", "ModuleType": 6 }, { "ModuleName": "PCPage/工时报表", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T01:08:28.6321317+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.json b/Pages/484d3ed119274a60bf32f15d178cf60.json index e824184d..d1dc67d0 100644 --- a/Pages/484d3ed119274a60bf32f15d178cf60.json +++ b/Pages/484d3ed119274a60bf32f15d178cf60.json @@ -43,11 +43,21 @@ "DesignLengthInPixel": 32.0 } }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, "9": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -68,16 +78,6 @@ "DesignLengthInPixel": 34.0, "IsHidden": true } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } } }, "InLogicalVisibleIndexes": [ @@ -109,6 +109,11 @@ "DesignLengthInPixel": 32.0 } }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -180,11 +185,6 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } } }, "Count": 23, @@ -204,14 +204,14 @@ "13,1": "删除此行", "13,19": "添加一行" }, - "Formulas": { - "1,16": "F8" - }, "AttachInfos": { "1,1": { "CssName": "ec-label", "TemplateCellSource": "类型加内容" }, + "1,16": { + "TemplateCellSource": "工时" + }, "1,20": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", @@ -847,7 +847,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!V3" }, - "TargetType": "Forguncy.HyperlinkCellType, ServerDesignerCommon, Version=10.0.0.0, Culture=neutral, PublicKeyToken=967100671921c115", + "TargetType": "Forguncy.ImageCellType, ServerDesignerCommon, Version=10.0.0.0, Culture=neutral, PublicKeyToken=967100671921c115", "MethodName": "ExecuteCommand" }, { @@ -908,7 +908,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "306179e9-25c3-41f4-9edb-c66bc0947c92" + "ID": "ad7ce55a-bebc-467a-a268-9f55d1fbc7c4" }, { "CommandList": [ @@ -922,7 +922,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "d2388235-ec4c-4ec9-97bf-e416cbf6bcc3" + "ID": "b9c96142-654d-4ca2-9d1d-2b8809820d9a" } ] } @@ -944,9 +944,6 @@ "Formatter": 2, "HorizontalAlignment": 3 }, - { - "FontFamily": 1 - }, { "FontFamily": 1, "FontSize": 13.333333333333332, @@ -977,6 +974,9 @@ "FontSize": 13.333333333333332, "Formatter": 5 }, + { + "FontFamily": 1 + }, { "FontFamily": 1, "FontSize": 13.333333333333332, @@ -1014,77 +1014,75 @@ "1,1": 0, "1,14": 0, "1,16": 1, - "1,17": 2, - "1,18": 2, - "1,20": 3, - "1,21": 4, - "2,1": 5, - "2,2": 6, - "2,5": 7, - "2,18": 7, - "2,21": 4, - "4,1": 8, - "4,2": 6, - "4,3": 2, - "4,5": 7, - "7,1": 8, - "7,2": 6, - "7,3": 2, - "7,5": 5, - "9,0": 2, - "9,1": 8, - "9,2": 2, - "9,3": 2, - "9,4": 2, - "9,5": 7, - "9,22": 2, - "11,0": 2, - "11,1": 8, - "11,2": 2, - "11,3": 2, - "11,4": 2, - "11,5": 7, - "11,22": 2, - "12,0": 2, - "12,1": 8, - "12,2": 8, - "12,3": 8, - "12,4": 2, - "12,5": 7, - "12,6": 7, - "12,7": 7, - "12,8": 7, - "12,9": 7, - "12,10": 7, - "12,11": 7, - "12,12": 7, - "12,13": 7, - "12,14": 7, - "12,15": 7, - "12,16": 7, - "12,17": 7, - "12,18": 7, - "12,19": 7, - "12,20": 7, - "12,21": 7, - "12,22": 2, - "13,0": 2, + "1,20": 2, + "1,21": 3, + "2,1": 4, + "2,2": 5, + "2,5": 6, + "2,18": 6, + "2,21": 3, + "4,1": 7, + "4,2": 5, + "4,3": 8, + "4,5": 6, + "7,1": 7, + "7,2": 5, + "7,3": 8, + "7,5": 4, + "9,0": 8, + "9,1": 7, + "9,2": 8, + "9,3": 8, + "9,4": 8, + "9,5": 6, + "9,22": 8, + "11,0": 8, + "11,1": 7, + "11,2": 8, + "11,3": 8, + "11,4": 8, + "11,5": 6, + "11,22": 8, + "12,0": 8, + "12,1": 7, + "12,2": 7, + "12,3": 7, + "12,4": 8, + "12,5": 6, + "12,6": 6, + "12,7": 6, + "12,8": 6, + "12,9": 6, + "12,10": 6, + "12,11": 6, + "12,12": 6, + "12,13": 6, + "12,14": 6, + "12,15": 6, + "12,16": 6, + "12,17": 6, + "12,18": 6, + "12,19": 6, + "12,20": 6, + "12,21": 6, + "12,22": 8, + "13,0": 8, "13,1": 9, - "13,2": 2, - "13,3": 2, + "13,2": 8, + "13,3": 8, "13,18": 9, "13,19": 10, - "13,20": 2, - "13,21": 2, - "13,22": 2, - "14,0": 2, + "13,20": 8, + "13,21": 8, + "13,22": 8, + "14,0": 8, "14,1": 9, "14,2": 9, "14,3": 9, "14,19": 10, "14,20": 10, "14,21": 10, - "14,22": 2, + "14,22": 8, "15,1": 11 }, "SheetStyle": { @@ -1132,4 +1130,4 @@ "PaperSize": {}, "Margin": {} } -}//K8Xgv4VyneoAkU0l0B62NHHrTjl0YwiJmiccdKz4h9fQ/lAy1GOWP68e6P5m+5TpcoDWWAL3Oiauajfef6x2EQDSA+oLVm22ns1p0Kh9cqRISgHrzh7YRHwyTOSXdLh9T5vh1TQgWUfPI+fKNNsPWNl2VLN7OSWWdEzK+A+l/oQSfzYzg9fH+Ykyx0gM1ux16QnxItMkJUGkeNcG4lRDFmZKLUXW92BKVGU4oGitCgeND3Isfx/I/KxTDKZupB9JF8wDUohe7duW4IfaTDaiDsdTHmZNxgape4ZZkCy5YaFssbkzHYkIaODqaZF9wYRN1640ZjE/SrBD00b6Mrl3k3k/lUXD21JtSZUmuAMfDvpWiWHdOOC86bplTDuqmh3L5oZ00U+oejQRWe9L+0FRHVMIUkjQeMK3Kn39fuJg9P0Uw58u1wcexpxwQszXD1dWGO/A6Z+SOIk5KTnaEdmT2uxMdJotiFM6TKUBK1CvDH1ah+S+bqeAJYpck8VzOZitEI94FTkInzWTgu+Uc3W8bDmrTjhTxVD1jivLv/vZev9pmHhhMwIUdjRukIz5IV7hvKgTzEvRZ38rG/rdUBoXpI5b1q91Rbv4hh8I3UcA2QNO7JLmZXRxcqct2JF6caNiLuom42eQ//xjNCfyjyBBqXn/r4285BN1/iSouau5zEC3hIfoTx97FDDygDMFtthxg+c0JoJOuOlv97XRvyAvwLfo+uwFCfNteeKzGRKkOQAVoDkkrrDFWs4OL2gFJoT9DTPcIeH3Ose7YXN8AeFlZllOPXGmeJO4wsF5a1N+yq6G7Ud/FjBS/28IC02q5Z71Nc1AWIe6iwwmUzig8uEWcU0MG80dBcrF8q+Lt/VYI6KXmXHfF30GstqqaP8Yx99X5r2PEs+KypmBJNvVhdb5Pg==|920 \ No newline at end of file +}//0exSiHXMa2+Hnzm27IVndiBgIuQeuywBycmGEuKPgNDX4JbTi88yg9ClF7bD3jIR0MHAyY0IGTBhQcfDVeU6teH6KeVFaHbAcBuCb/uiHSZg9FAWh2ffXKgbXnS/s8K+/aqD1Bzqgiq1NrN1FISX6PpLR1aOCKThCqETrnOx9NOzFwfV9ek9NeZvoUwQFAhBZYhXApN72h+vOFJc3yL0k1ybtOkVWvRc9hK9o1Lle+ARFwhgRORc9mIpucNa0fR4VUjnSw2gPh48tS19IxA5wKn/RD+T/kjbiQoSmmrZO0NGmjuvAVvkcbw/6K3g3+Pb0XMlFFotnEDwhMHNeJBVreNjZMgtXa7vSIT/J5DtSHcAu7+To6QpS6v36OajZRKC3o+oicnTW/P5Z6oVQoHC6eXTemh05i+Ea21a2MTp+PUfKbiQmCeA27i9eJLSmFdKh0ES1g/rzJhe8RUoNd4F51EFnxyXxyBPdk+q3OeI5JrkD9wwRohct/BV5uBclcRwfJENLEluUuuE6gWVyDiBfrzCRIdg8U1O3Fv0/7+e/O5mD44Z/7XvgoNqUrD43+6FelwUgiP6XhuzJO+9PTUlNXHurMJbImIaiWtIvkQ+99sN4tFUlHEdsl5ZUp3AAtbBAUouxBbwUwZXCTLC+7fX4fkApKorTMaAPu/YPBRgA8bg1nUh8tmdUKF/rFlteOIDoI0BlguMpduD3yFJ1YkWNew6AuJqmGGkXlDQWZO4HfsicVE71S7RklFlPUUlImuss/otjCPeR/q1bT98L36vpXohuDzvWErjr1TK3sSIsFchpBO+IE/8RkzDVqjoDui/qZzApbMedX9Dq6ulNSeVwJ0zZE+LF/HRKKhBLHV5IdgF3Frn8Nyu1Em1Gd01xexEdjJPYhAD5ao/1U4eo6klHA==|920 \ No newline at end of file diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.rd b/Pages/484d3ed119274a60bf32f15d178cf60.rd index b41609f5..0d7aef61 100644 --- a/Pages/484d3ed119274a60bf32f15d178cf60.rd +++ b/Pages/484d3ed119274a60bf32f15d178cf60.rd @@ -1,8 +1,5 @@ { "PageType": 2, "ColumnCount": 23, - "RowCount": 16, - "Formulas": { - "1,16": "F8" - } + "RowCount": 16 } \ No newline at end of file diff --git a/Pages/工时/工时报表.json b/Pages/工时/工时报表.json new file mode 100644 index 00000000..ddd7c7ed --- /dev/null +++ b/Pages/工时/工时报表.json @@ -0,0 +1,69 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 45 + }, + "Cols": { + "RowColumnAttachedInfos": { + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 60 + }, + "StyleDatas": { + "Types": { + "Strs": [ + "Body" + ] + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//tbDXII0Mhpvv06FlMz+yIwY/ZdkixjJ6Agsgz8AQgu1B94XyEieuFhhppFJ02GL0nWLxleLHo/pP1vRyKxDVosDZvxcamfZb3RDZDBVRS8Dbj0f6sopHdDBVADibYBmbsGytGawU0U9+SOKIo1e6p9ukcjqsly56lwJ2izg9xe9QOINQu9Fp6rjdNEob0fioCLLKp8BD0/acak3iz3OhoWBlaQtNZ1TT5k8Srz0AmRaECDKIZXkIK9MXP0rhHBuz9QZrh6u9Fqh7H+OfNB6QTFpE8aMZFM5+go829DEVek+o30+CB160J0a2HxyW/dl0EgieKusuSmejozvRNGRmnr7S68ZvbFAJY2GdDim7M0figSTBkTLB/2t62TEwqwZNG28KsirtoL1CzFo9bJauSV1Nw6HfkAKS7LbgRol8fmCNRU3A7r0578D/mem6WpPPxk2pnNDNH4W/ISHA33fjoYdRUD31lS3mZmHAtqp9DgQbk+LjP9QiVmeJeQfWeCNbWV0ZoJzdGMHqi9URjwgJ2k2lDzet0s3BqAUIB8V/1OKwiWELVwSW6o6WgdovbrdD5wl4LTEM8GPROa/+ixu+Tcok78ZslrYlMt7mcHrZNHs4TE661S5CKNKRLzwH/igcq76JOYzUrLeI8+oM6c5C79wPYe+S5HiUWOTE1kyxXvd+C+xjMRE03jfiPj7hN3INlDhhIh/K5KVNzU+y+9zFPOPbBAUD0hEsXwQCYVAKrMLrlPpwkVy7yG62NEZga08QIsvSVingln0DwlJfZfaJBBlCY5Jq4Th2jaXXWjqcwVDj4cPbCXLrWVr6i1PztwyTm3GoF9sUT+fvSI98yfFuKMlMru8ePZHHsgxvuJ8RWKCvapAx/onJjtwSlU4mpcjS7zZ1BhnDslA9j2acLYTCDA==|920 \ No newline at end of file diff --git a/Pages/工时/工时报表.rd b/Pages/工时/工时报表.rd new file mode 100644 index 00000000..47790895 --- /dev/null +++ b/Pages/工时/工时报表.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 60, + "RowCount": 45 +} \ No newline at end of file diff --git a/Pages/汇报/汇报详情.json b/Pages/汇报/汇报详情.json index e76ae257..2efb274c 100644 --- a/Pages/汇报/汇报详情.json +++ b/Pages/汇报/汇报详情.json @@ -16,6 +16,11 @@ "DesignLengthInPixel": 23.0 } }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -46,11 +51,6 @@ "DesignLengthInPixel": 32.0 } }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, "10": { "GridRowColumnDefinition": { "DesignLengthInPixel": 39.0 @@ -544,7 +544,7 @@ "ReloadData": true } ], - "ID": "332e12c4-61ab-4e4f-8d96-b2363ea2cce6" + "ID": "b88a1d07-b920-4bb8-baf6-c9e576ad812f" }, { "CommandList": [ @@ -554,12 +554,12 @@ "Message": "该日期已存在汇报,请前往列表中进行更新。" } ], - "ID": "b40b5c00-df63-48ac-b9d6-a7b0e777e642" + "ID": "1f8a974f-eaf6-4580-8c23-55e8b530dded" } ] } ], - "ID": "bf1a01c0-63e8-43db-993a-4babc98727d0" + "ID": "f8293d17-bf2f-4d6b-9850-75bacb34e781" }, { "CommandList": [ @@ -637,7 +637,7 @@ "ReloadData": true } ], - "ID": "3bcedf57-c838-4e61-9b5d-14e23a81dac2" + "ID": "e96aa017-234a-46a5-90d4-996db862c6e6" }, { "CommandList": [ @@ -647,12 +647,12 @@ "Message": "该日期已存在汇报,请前往列表中进行更新。" } ], - "ID": "0c05a499-f911-4c3e-9ae0-3d5d5a4e1837" + "ID": "188381c3-1e97-4e2a-9f3c-192b8ccba512" } ] } ], - "ID": "8182a763-fbfd-411b-821a-6565857584c5" + "ID": "c3c0bedf-0b04-4d71-99e7-f38e90dee325" } ] } @@ -966,7 +966,7 @@ ] } ], - "ID": "84116518-c24d-4523-a7a0-0c00e8fd8e7a" + "ID": "3477b01f-3268-4153-b863-a8e90a5430f7" } ] } @@ -1006,4 +1006,4 @@ "Formula": "汇报详情!$I$2" } ] -}//GFS22rh1WQW0BZ0ejzZIyCbxt88bUbwlHH5ZqlBRLte0jiDNo5qRcKrBZQPJyWp3zo9DSGBhv+D52EGedscqWzondmX9F/xuA5fiFvwz/c4rDF2SO6yT1v6D0yFTNcKQ2vZybTpvWawmSurcWO8N+lQluGylEiBxkEcm4RNa4hFwee9wpxBcEbFnZSiQVDnIAAr21YS3Cto0XlZ2KBHCwhbEscbuIrWerJIqgucvoEoFL8qdEUNvbW9krwiHnT5gSPJ7zXui0zcAgPXz5BNI1dq6dHiGvJpA0EHx3JlYsdIxodoG6F77SyhhrAmGTgQgWvB7UMilNwMaVDoB5TKkS2QImTlJJAu7Dfz6AnfpcTU7sC/ic0NQBOIeZTIhkre44jO2nROr9BL18ksCb8b8N8lo6cwzB9a0EUNwjczyfTKesZ8HdKlZyUspxlh+xr/1A2M0IiyKBLNoXnZ9YBq4Ek5vKmvOKPfnpNMt5V5a5Gf7HopTS8zfymglRgOgGrkPwa/ox2aYGNdml+ahkSMQm0eVJDNVicJZ1qSNBLyNL7C83I6lK/8+lyoXr4oTmYjj5TU8FaQsEc1ZzsYTV9Gn7IWHZju4kKrRSqhQTMKAj/NawpwOiGmFir7e+yVhjKt5b6rqxfmBH4eelM4Py80ip/yFzVO7mXZIZWAUE3Ei3K4ys5uXUgKcN6cM5/uGAZHQaDUiwzj1cFzv80EPMxfQkjvxxh6OIYf2ZjVdgz0AZIhtFw2u6GLipJQf+JsBv54+8laYWiAMg829LeCQhsIFDnnG3Y/PkIE/ZyIhKO3FfYTenPZjukNYGoHBN3XBsyVyZcHK0Qxb1fNv7+pFIZoQPpYf4NDx0Dl61i7vfjTCY701DFK8hjnSNM/7d854lWbsv/xTSE7f3IfPW/tBIfs1aA==|920 \ No newline at end of file +}//goYnVqAgVgJ5Q5P6Z3omxiolu11KXUEim6haC05VFzf+RwVyWaQke+gScsCXU8uFGR7Hcfo5IZhqoMQdQfmS+8W2a1Ah3DNLdlu3xRsnpEoaCJeoRJVNfkbyllgjwwJOyM30jii128roiW0DaWrvZQgT6LUXsv7+yj2uKqqKBiftYGKtGRw7NUwqqPLwxhFWLCwKtRfJNlNx1uipmk1wea0ymzqdjwpoJ9GjeR/D8B67XVJvJUKTn5qBCUfYG58o0+9biwC8EBU7//zhgz9MHhLJIBrEJRwYE15deJazbwPnyAZ/mWDyQvphGfs7LSadIYFJTX5e70PpwH7XWrD0iuSuSaJkWIQm4deZ82jygPxOe++EGc882cehBf4CrqDYsaE2PzpDNMMlApJfokHQloAEhL2JZOGeuIDeXvIF6nWAwdBRelZkQIfwHvHCau42CYIfOOZkFxZw0QvCzrwYuaoVJFxkhBGTYbAZAOygPkwM0cscw3N7As9sRMS5BrW2oNqQh3Z5UdZfxPBZu4pO70pSu/caJ/jB/i5ZMQalLUsSeuR+eCnoXtpm9zqm0jzIF5wrRFZ3Kxz5jpcGHXjsurISjKQEblTMFBXbD0ZS63w2O79GkJ5qkKYFVnWzTH/ciwh+V/gub9PZXQXHuPQAhWJ4iNapGWAyf6IzsNv5SGBFvJifkWLmoP5KRPh38dNXCrD+V9OQlbuBCKr2oMX+rtDtJPJCqdHzwA/t3cGyxQn6XQScbYK0LjCAK9l3Ek4yt0AzLkzhgvAjfELlsKFiutbSWbdTzAdUgUxGtxlKqu9stSMtroKdv35rCcm/FJFHCisScYoKZZyNLXt6hxcgI6i1nj2WcgQOlbsqlhbDRZAbTGGoqWJubAXJFMsDgPehJ9JlklztzNotoeDABiZQNQ==|920 \ No newline at end of file