From 01d9a2238dfbc5ca2a6ff9b9dbea4298e8d3fc8d Mon Sep 17 00:00:00 2001 From: cuckooent Date: Tue, 1 Jul 2025 12:13:58 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E7=94=9F=E6=88=90=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E7=94=B3=E8=AF=B7=E5=8D=95"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 12 +---- Pages/收益/生成结算申请单.json | 99 +++++++++++++++++++--------------- Pages/收益/生成结算申请单.rd | 4 +- 3 files changed, 59 insertions(+), 56 deletions(-) diff --git a/.collaboration b/.collaboration index 5b31d771..94b5340a 100644 --- a/.collaboration +++ b/.collaboration @@ -1274,17 +1274,7 @@ }, { "ModuleName": "PCPage/生成结算申请单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-01T12:12:30.0118701+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\生成结算申请单.json", - "Pages\\收益\\生成结算申请单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/个人中心", diff --git a/Pages/收益/生成结算申请单.json b/Pages/收益/生成结算申请单.json index 9ed525e5..71e124f8 100644 --- a/Pages/收益/生成结算申请单.json +++ b/Pages/收益/生成结算申请单.json @@ -62,7 +62,7 @@ "DesignLengthInPixel": 32.0 } }, - "24": { + "26": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -74,23 +74,23 @@ } } }, - "30": { + "32": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "31": { + "33": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 36, + "Count": 38, "DefaultSize": 32.0 }, "Values": { - "1,29": 0, - "1,31": "生成结款单" + "1,31": 0, + "1,33": "生成结款单" }, "AttachInfos": { "1,1": { @@ -144,7 +144,7 @@ "DefautWeekFormat": "yyyy 第 WW 周" } }, - "1,31": { + "1,33": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -294,7 +294,7 @@ "BreakpointIdentity": "7ae1633f-ac19-4dca-bdce-a4e43c0129e4" } ], - "ID": "35a92601-6532-4840-8994-ae9382637e5b" + "ID": "add0787b-c3c5-4338-859e-c67fde8c9a75" }, { "CommandList": [ @@ -308,13 +308,13 @@ "BreakpointIdentity": "28b82df2-ddde-45f7-937c-ae8ff56efade" } ], - "ID": "fc291e68-a081-4271-9c27-dea1c78336e4" + "ID": "87f97da7-7fcd-483c-9388-19a187473bb2" } ], "BreakpointIdentity": "43c7eb20-b0f0-4c86-804b-fe485e876a71" } ], - "ID": "cd1e3848-2533-4a8d-b3dd-7869624f8d2b" + "ID": "cd6be82e-2bc4-4757-90b0-baeac0df7e7c" }, { "CommandList": [ @@ -325,7 +325,7 @@ "BreakpointIdentity": "0998dfd3-3863-44b0-80db-d53a7b86c2b0" } ], - "ID": "94a16925-5415-44f1-ab21-2fbe4a548b17" + "ID": "bcc879ba-3941-4384-a21f-5e0c93095780" } ], "BreakpointIdentity": "63226f95-d7d9-42c6-9a09-77015cbb2d07" @@ -606,6 +606,27 @@ "cellType": "default", "key": "02b51286-fb1c-4cb6-8213-078da1acb7f3" }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "工时日期", + "sortable": true, + "allowRoles": [ + "FGC_Anonymous" + ], + "label": "工时日期", + "width": 130, + "colStyle": { + "formatString": "yyyy年MM月dd日", + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "filter": true, + "multipleFilter": true, + "key": "7444a0b9-613c-4834-b4bc-f6a15205f943" + }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "项目名称", @@ -646,27 +667,6 @@ "multipleFilter": true, "key": "6835315c-704c-4e7d-a7f3-9d4fa3487a67" }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "工时日期", - "sortable": true, - "allowRoles": [ - "FGC_Anonymous" - ], - "label": "工时日期", - "width": 130, - "colStyle": { - "formatString": "yyyy年MM月dd日", - "horizontalAlignment": 1 - }, - "colHeaderStyle": { - "horizontalAlignment": 1 - }, - "cellType": "default", - "filter": true, - "multipleFilter": true, - "key": "7444a0b9-613c-4834-b4bc-f6a15205f943" - }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "时薪来源", @@ -702,6 +702,8 @@ "horizontalAlignment": 1 }, "cellType": "default", + "filter": true, + "multipleFilter": true, "key": "bab36fc5-a88e-4595-b87a-0be2823955e6" }, { @@ -720,6 +722,8 @@ "horizontalAlignment": 1 }, "cellType": "default", + "filter": true, + "multipleFilter": true, "key": "52cff03b-69e4-489c-b515-76b55378f421" }, { @@ -737,6 +741,8 @@ "horizontalAlignment": 1 }, "cellType": "default", + "filter": true, + "multipleFilter": true, "key": "cd0a56ee-4064-4be4-8ee7-781ce705747c" }, { @@ -754,6 +760,8 @@ "horizontalAlignment": 1 }, "cellType": "default", + "filter": true, + "multipleFilter": true, "key": "a8b79f20-733b-45e7-8967-6f87614a8444" }, { @@ -773,6 +781,8 @@ "horizontalAlignment": 1 }, "cellType": "default", + "filter": true, + "multipleFilter": true, "key": "b4738d60-c16d-48e6-9547-411501dd0d4a" } ], @@ -797,6 +807,7 @@ ] } ], + "showSummary": true, "sumText": "合计", "size": "small", "showSelectColumn": true @@ -844,15 +855,17 @@ "1,18": 0, "1,19": 0, "1,20": 0, - "1,26": 0, - "1,27": 0, + "1,21": 0, + "1,22": 0, "1,28": 0, - "1,29": 1, - "1,31": 2, - "1,35": 0, + "1,29": 0, + "1,30": 0, + "1,31": 1, + "1,33": 2, + "1,37": 0, "3,1": 0, - "3,35": 0, - "4,35": 0, + "3,37": 0, + "4,37": 0, "6,1": 0, "6,2": 0, "6,3": 0, @@ -869,11 +882,11 @@ } }, "Spans": [ - "3,1,2,34", + "3,1,2,36", "1,1,1,13", "6,1,1,3", "6,4,1,3", - "1,31,1,4" + "1,33,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -903,7 +916,7 @@ "CustomNames": [ { "Name": "总金额", - "Formula": "生成结算申请单!$AD$2" + "Formula": "生成结算申请单!$AF$2" }, { "Name": "开始日期", @@ -914,4 +927,4 @@ "Formula": "生成结算申请单!$E$7" } ] -}//qO5mOVQQc21NSDvOxOiLytyRR3VL64OiSOQhGi/HJDuTp2nw1AM1/RxuwKsE9/5K6Iatw+qStuDCpICWMJUyLgPRV7AuQP64TXjvDUuOe6L3Rizf5S6AWktGxLYkt1tymbDR7YgUu53vfD3C4Cd2u9resx/GpZC94b4lnT3QBU75KhT1xsAwGVPKR0duerK5Sx5+Cj7fcIE/QZXl4BCVUudyucT6O5d0vrKXIDFd7OwDQXxwLLbUSTBrC+gn6jQlxjz2Rd4ahZuZEG484h9EdtObx2DKXK+QJSuciF+L8SQojxNcZNMfm342S3ioNLZcwvvSAyoC5Hv0FG529troOEPpOjRQuiC2YuSGQ1iFO7P93NbLvlcN0M7vQGhHKB/+4cva1pcS7FEllrHaJsLzRNXkVpZJCIuqhO/yeFjJBXayBCUWP3JbM68ZRRZqe+AsDtUswYYU4hkxTT+BygUoAKbburEjU6dUjD6CSNUok80sZZRdp5WLAIjxUO4o3jBx3z0F63MxzgPWSGSD+btO5fPhHeSqJdx2BL3wmNJbCwBA9/kd7wzuUf/sP5USpf7utR6ir7kuHPQphE91fuq1W7ykxa1QFADpfL2zEXHgpVloAifFAwX8YgRIzwF4I/0J6Awk2A0GczFbGYXvkWh3GVSla1+f7OVS++Y/1ESeTBaaSF9moh7xQh+bhFLmzvVj6hs2x7uytwB4ixuzwUujW3rUTfzgRxTNfSS0/26lVq5hfcxn8SUGOJeU4uUuKoPNHBSgrgeMdfZYPtgN13U/ZF7F2OblBPUh4Zhxvnj+LV9b06SsxCfBVaMEQN8E1k3y1MODfX5NkSniJaPZJWRdqZ8Q4PE1dI8TWUSzbgk5yvM2qqWpju+aqCswuRmjkpJVv6HmddsLBZxWEMcXZlSy8g==|920 \ No newline at end of file +}//ZNKF95i2twhiGVOWzC0EdCJDABpl85YwMpIkjutlL5152vcWOjHTrBEkg+5dp6Pj3BxMCojNBLTuvRHFgSVngEYljpXKelo5AbY6JSQ+FPoI9LzpnSyS2C9txqHLUlPFxLiAsJH5jIM7oKfqayobvxxDObuFuh8FSWvbFvCcpjBjoBKCyl1qdoR3X04cJUFTKqLYr9lRI8HbKf/JlVmsp53ewIMO+5RNzi98jXlgiy/POjEvqO+FQ0eATRAGVNjItO3KtlQoFzR8fPnd6dhjUY4XfRwX0iM8iMG/6O16ydpfkGSssmszCraWZmV5nMMLrAmUTFZFT4L5sv9S950tz9MyFqnJKx4Km6/kWRjpRPAI24Tok0izNdHY3jad5eaSfeRXOWzKqt8Me7GJTBhv+lqxBEd1gR30kd0Hj02HTmGAGbSuq8nIrdje3yVe8DuJYHUO3ZszKmsKasXWuQcVLk2aLYn9glaAkaSFt+UJijn5ac51bQrQtJK6c4ZChhbeQ9202iyuhhcsiQI7mKAu5ZuMUQqPgkwMByMmk6aAjX2vOXnWrlWMO43XdxetZ4DgcZu0ICFbHSeLnrr4Liy5nxcEyHvh+VMAnaYWSNDzxd1qMQXFMSxFImWfaY5esERE2WBGQ8tZcg/Qbd1pnauM+8cqDb9mqxN6fp2vfbGEYZT8swDV2ManZT74vS1MiZ/kcp/K/gDJZI7w+IAP3s91pf9+nmuxNrxTJoBQvUGMhWSke6hVvYy+sZ8iSXugesiR9yuMzXLJ/z4UiKMzwlAp/Dtk3H5AgNe5DAeTTIl4ELxJQGWkclArwSBtdZe20K62jzUPBdSfWUB4PzT+P+FjP4GiYDO/XC1xMhVWQEQX/EwzWS94imNxj+iUcGfwdp30Pv3Z1UbxiOpAuQLpScf1Fg==|920 \ No newline at end of file diff --git a/Pages/收益/生成结算申请单.rd b/Pages/收益/生成结算申请单.rd index aa776593..afc2eb0f 100644 --- a/Pages/收益/生成结算申请单.rd +++ b/Pages/收益/生成结算申请单.rd @@ -1,11 +1,11 @@ { "PageType": 0, - "ColumnCount": 36, + "ColumnCount": 38, "RowCount": 7, "CustomNames": [ { "Name": "总金额", - "Formula": "生成结算申请单!$AD$2" + "Formula": "生成结算申请单!$AF$2" }, { "Name": "开始日期",