From 998674178da3a940632c44de40f339afc0eb3ecd Mon Sep 17 00:00:00 2001 From: cuckooent Date: Tue, 1 Jul 2025 12:12:11 +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"},{"State":1,"Type":15,"Na?= =?UTF-8?q?me":"ServerCommand/=E7=94=9F=E6=88=90=E8=AF=B7=E6=AC=BE?= =?UTF-8?q?=E5=8D=95"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 23 ++----------- Pages/收益/生成结算申请单.json | 39 ++++++++++++++-------- ServerCommands/收益/生成请款单.json | 51 ++++++++++++++++++----------- 3 files changed, 60 insertions(+), 53 deletions(-) diff --git a/.collaboration b/.collaboration index f5cc463b..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:10:15.6320959+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\生成结算申请单.json", - "Pages\\收益\\生成结算申请单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/个人中心", @@ -1732,16 +1722,7 @@ }, { "ModuleName": "ServerCommand/生成请款单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-01T12:11:30.1211457+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\收益\\生成请款单.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/完成请款单", diff --git a/Pages/收益/生成结算申请单.json b/Pages/收益/生成结算申请单.json index 404b8196..9ed525e5 100644 --- a/Pages/收益/生成结算申请单.json +++ b/Pages/收益/生成结算申请单.json @@ -294,7 +294,7 @@ "BreakpointIdentity": "7ae1633f-ac19-4dca-bdce-a4e43c0129e4" } ], - "ID": "1da2a586-6b55-45e0-9a26-e4e015f44e41" + "ID": "35a92601-6532-4840-8994-ae9382637e5b" }, { "CommandList": [ @@ -308,13 +308,13 @@ "BreakpointIdentity": "28b82df2-ddde-45f7-937c-ae8ff56efade" } ], - "ID": "eaa5aeac-bd01-4428-a78e-043c60f4e10f" + "ID": "fc291e68-a081-4271-9c27-dea1c78336e4" } ], "BreakpointIdentity": "43c7eb20-b0f0-4c86-804b-fe485e876a71" } ], - "ID": "d07ba9e8-3e2a-4eb6-96e0-5b51f8c0a9f2" + "ID": "cd1e3848-2533-4a8d-b3dd-7869624f8d2b" }, { "CommandList": [ @@ -325,7 +325,7 @@ "BreakpointIdentity": "0998dfd3-3863-44b0-80db-d53a7b86c2b0" } ], - "ID": "0435e77c-f080-42c2-aafb-d428f0b1b920" + "ID": "94a16925-5415-44f1-ab21-2fbe4a548b17" } ], "BreakpointIdentity": "63226f95-d7d9-42c6-9a09-77015cbb2d07" @@ -558,17 +558,34 @@ }, { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, "ColumnBindingInfo": { "TableName": "任务工时表", - "ColumnName": "是否请款", - "GUID": "dbfa8eda-8005-4b29-a415-e6d345c93c4b" + "ColumnName": "请款单ID", + "GUID": "c2afefdc-7351-4496-a4b4-8f59aee6a8be", + "RelationBinding": { + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "状态" + } }, - "Value": "0" + "Value": "3" } ] }, "NullFormulaValueQueryPolicy": 1, - "CustomColumns": [] + "CustomColumns": [ + "ID", + "工时日期", + "项目名称", + "任务名称", + "时薪来源", + "时薪单价", + "提成系数", + "上报工时", + "核定工时", + "核定收益" + ] }, "autoGenerateColumnsByDataSource": false, "columns": [ @@ -637,7 +654,6 @@ "FGC_Anonymous" ], "label": "工时日期", - "formatStr": "yyyy年MM月dd日", "width": 130, "colStyle": { "formatString": "yyyy年MM月dd日", @@ -678,7 +694,6 @@ "FGC_Anonymous" ], "label": "时薪单价", - "formatStr": "¥#,##0.00_)", "colStyle": { "formatString": "¥#,##0.00_)", "horizontalAlignment": 1 @@ -697,7 +712,6 @@ "FGC_Anonymous" ], "label": "提成系数", - "formatStr": "0%", "colStyle": { "formatString": "0%", "horizontalAlignment": 1 @@ -750,7 +764,6 @@ "FGC_Anonymous" ], "label": "核定收益", - "formatStr": "¥#,##0.00_)", "colfixed": "right", "colStyle": { "formatString": "¥#,##0.00_)", @@ -901,4 +914,4 @@ "Formula": "生成结算申请单!$E$7" } ] -}//aBdz0erLsCXGpjRUmoQtRAXMHx4pcksXMyUwyD4VH/OyES6DVfO9W3hdBVURrmU7LHvoBkF2EzhgFtc1w+eJ4uqC+Lnx0PIoesamGZQxOB+bHS025r9qkfpmY8GI20xt8HZ7zYgjvqS6wVQ2w8Hlc/wwPR6p8PEZmm8oiI7wkE6PUhdlkWtD3yy9EdPozU4fDPMndLfJ6efN/tZ+QX5lWk8+mp9zyN63HZuoWyD0pRrwNKqQ3KdB8xGcCAat0A4yT7Fa0kzEBWd9iqbGvqVSyv6bQ8rk5fMjPKTuXWTkvDeht+0pc3Z82r+sn0DbXZ7k3dhCgBpxxzSsXQPOSfffZ/IV27cOsYKswt4HszrR29x3iRwcwjoQrrsM9VQx3rjJHOwzAmR8mKmX7fn5Wz4EAfPHHph3M6x/KYzJlAhNVbBmF4t3/et1gWZ5Q8UDtu8Q7fFAGP8xkkzXno3s3iopqkifaEk9XecI420adm+HxXTN+J4FcFpRUSEa+dldxE7D499bfUPkrHEPZi0MT32DC35SLzOQpkgG2wbF7FNqL/IIGEz/5e6zru5aHtbsw+18bn4QEU49FH6rpzgPl5kl/UZjkgdEuSqg0eIkKDb+8+vEpWyeE4YFo268wGKw6IZscwhsTYWZi2FThCmulQtp3n7TgeNQV+zJLQ04GyzF5MKDHEnPfKZ4lnQV2MemCgY2kBRQkdUdYiWmJ9uIplkHSKA1A5uCmNBQ/kYZFRKhLXUu6LfZ1tCHHn5ScNO3Bir1z3DIc0SuFd0PAWlZSuZDFy/iRt6fG6iDnSYmzH7m28rI4lTWdtOoFtOL95t4Rbzpkgjfq2LKrBSOj5zI2yQdsCO5RBz7ePnTJGtaUvOOwnoSLjxe9U7VrRusBHg29iYKV2DvPYufsWAZN4KJ3FtqVg==|920 \ No newline at end of file +}//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 diff --git a/ServerCommands/收益/生成请款单.json b/ServerCommands/收益/生成请款单.json index 422b8cfe..4e51eef8 100644 --- a/ServerCommands/收益/生成请款单.json +++ b/ServerCommands/收益/生成请款单.json @@ -88,17 +88,23 @@ "ColumnBindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", - "ColumnName": "是否请款", - "GUID": "74138321-dcbc-4d9a-b4a1-3ada8c41d214" + "ColumnName": "请款单ID", + "GUID": "41644b02-e8c5-4634-96f6-1616c9d0c862", + "RelationBinding": { + "$type": "ForguncyDataAccess.RelationBinding, ForguncyDataAccess", + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "状态" + } }, - "Value": "1" + "Value": "3" } ] } }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "4b82b14025984224abd390c269d3f762", + "ID": "1b38663c741e4c80b35bb33e3ddab8bb", "BreakpointIdentity": "b6343893-72b8-42f1-8f81-52a7a06d4197" }, { @@ -134,7 +140,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "a2491042-2ce1-48ff-992c-c00115a515b9", + "GUID": "1109b241-d64f-4792-bfd1-c06789ba19cc", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", @@ -145,7 +151,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "a98ae5d4-9431-45d2-b81f-539a58c792f2", + "GUID": "98348e66-1ee5-41b9-8d21-bc3868affc57", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", @@ -177,20 +183,27 @@ }, { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, "ColumnBindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", - "ColumnName": "是否请款", - "GUID": "eead7ffa-1ca4-4700-a84e-32710d76ebae" + "ColumnName": "请款单ID", + "GUID": "28af211f-ae74-4d36-afd4-e7da082d8641", + "RelationBinding": { + "$type": "ForguncyDataAccess.RelationBinding, ForguncyDataAccess", + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "状态" + } }, - "Value": "0" + "Value": "3" } ] } }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "6157ee87b3124e34b569b2553994bd1e", + "ID": "794f11011baf441783bb35a099e423b0", "BreakpointIdentity": "34bbe0d9-71af-4a22-9658-f92c70d9d5b7" }, { @@ -234,7 +247,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "收益请款单表", "ColumnName": "请款日期", - "GUID": "62435986-c8bf-4491-aaf8-ec30e282b42b" + "GUID": "a5252ab5-9b38-49b9-933b-e7bd2d2c2592" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -247,7 +260,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "收益请款单表", "ColumnName": "请款人", - "GUID": "eafbf4d3-4c74-44eb-83ee-cec98785a0c9" + "GUID": "93ec8708-69e5-4232-93e9-73e4c1fd701b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -260,7 +273,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "收益请款单表", "ColumnName": "请款金额", - "GUID": "8e6c8fe9-3f92-4e3d-a524-1384df5f04a0" + "GUID": "0983c1aa-ca3a-444c-8f2d-8801ee4e0464" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -273,7 +286,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "收益请款单表", "ColumnName": "状态", - "GUID": "01351c77-d2bb-4497-ba13-cf2210e5c0b0" + "GUID": "3bb31ae2-9852-4f46-9c29-fcd9cf6418f4" }, "Value": "0" } @@ -310,7 +323,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "请款单ID", - "GUID": "07397efc-e2da-4a06-a997-087d59191b2d" + "GUID": "518b6df6-f9a0-4c90-866e-dcb41a81a238" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -346,7 +359,7 @@ } ] }, - "ID": "28cdb34b-067b-4463-916e-0f374440fdb9" + "ID": "d58d8c29-f050-43ac-9219-4fc3003770a3" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -370,7 +383,7 @@ } ] }, - "ID": "3d17f717-0dc4-48ed-bf7f-5613c41c071c" + "ID": "65b99a0a-42e7-49c3-9df0-b5931382012b" } ] }, @@ -378,7 +391,7 @@ } ] }, - "ID": "ca8d060f-246e-4956-8034-f0340fd9c138" + "ID": "8f8cd807-57e9-4060-a649-3601f16a6ad1" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -402,7 +415,7 @@ } ] }, - "ID": "80dede65-4195-450c-b67e-7afb96bb509a" + "ID": "88ad7c70-64db-4129-99b5-d17cc6fd9765" } ] },