From 893e5c862c7812d0fe8c18652be8820b3ba367dc Mon Sep 17 00:00:00 2001 From: "SHAMUSPC\\NINGMEI" Date: Thu, 28 Mar 2024 23:13:02 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=A2=9E=E5=8A=A0=E6=94=B6?= =?UTF-8?q?=E7=9B=8A=E8=AE=B0=E5=BD=95=E5=8F=98=E5=8A=A8","MessageType":2,?= =?UTF-8?q?"Modules":[{"State":1,"Type":7,"Name":"Table/=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=B7=A5=E6=97=B6=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=B7=A5"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/FGC=5F=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85"},{"Sta?= =?UTF-8?q?te":1,"Type":11,"Name":"UserService"},{"State":1,"Type":7,"Name?= =?UTF-8?q?":"Table/=E6=94=B6=E7=9B=8A=E5=8F=98=E5=8A=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":31,"Name":"UserControlPage/?= =?UTF-8?q?=E6=94=B6=E7=9B=8A=E6=95=B0=E6=8D=AE=E6=A8=AA=E5=B9=85"},{"Stat?= =?UTF-8?q?e":1,"Type":1,"Name":"PCPage/=E6=94=B6=E7=9B=8A=E4=B8=AD?= =?UTF-8?q?=E5=BF=83"},{"State":1,"Type":1,"Name":"PCPage/=E6=94=B6?= =?UTF-8?q?=E7=9B=8A=E4=B8=AD=E5=BF=83-=E5=8F=98=E5=8A=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95"},{"State":1,"Type":1,"Name":"PCPage/=E6=94=B6?= =?UTF-8?q?=E7=9B=8A=E4=B8=AD=E5=BF=83-=E6=94=B6=E7=9B=8A=E6=98=8E?= =?UTF-8?q?=E7=BB=86"},{"State":1,"Type":1,"Name":"PCPage/=E6=94=B6?= =?UTF-8?q?=E7=9B=8A=E4=B8=AD=E5=BF=83-=E6=94=B6=E7=9B=8A=E8=AF=B7?= =?UTF-8?q?=E6=AC=BE=E8=AE=B0=E5=BD=95"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E6=8F=90=E4=BA=A4=E7=BB=93=E7=AE=97=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8D=95"},{"State":1,"Type":28,"Name":"ProcessItem/=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E7=94=B3=E8=AF=B7"},{"State":1,"Type":15,"Name":"Serv?= =?UTF-8?q?erCommand/=E7=BB=91=E5=AE=9A=E5=B7=A5=E6=97=B6=E4=B8=8E?= =?UTF-8?q?=E8=AF=B7=E6=AC=BE=E5=8D=95"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E5=AE=A1=E6=89=B9=E7=BB=93=E7=AE=97=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8D=95"},{"State":1,"Type":7,"Name":"Table/=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E5=87=AD=E8=AF=81=E8=A1=A8"},{"State":3,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E5=8A=9E=E7=90=86=E7=BB=93=E7=AE=97=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8D=95"},{"State":3,"Type":15,"Name":"ServerCommand?= =?UTF-8?q?/=E7=BB=91=E5=AE=9A=E7=BB=93=E7=AE=97=E8=AF=B7=E6=AC=BE?= =?UTF-8?q?=E5=8D=95=E5=87=AD=E8=AF=81ID"},{"State":3,"Type":15,"Name":"Se?= =?UTF-8?q?rverCommand/=E8=AE=B0=E5=BD=95=E6=94=B6=E7=9B=8A=E5=8F=98?= =?UTF-8?q?=E5=8A=A8"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 195 +---- Pages/任务/工时/修改报工.json | 88 +- Pages/收益/办理结算审批单.json | 775 ++++++++++++++++++ Pages/收益/办理结算审批单.rd | 15 + Pages/收益/审批结算申请单.json | 59 +- Pages/收益/提交结算申请单.json | 78 +- Pages/收益/提交结算申请单.rd | 10 +- Pages/收益/收益中心-变动记录.json | 282 ++++--- Pages/收益/收益中心-变动记录.rd | 4 +- Pages/收益/收益中心-收益明细.json | 309 ++++--- Pages/收益/收益中心-收益明细.rd | 4 +- Pages/收益/收益中心-收益请款记录.json | 307 ++++--- Pages/收益/收益中心-收益请款记录.rd | 4 +- Pages/收益/收益中心.json | 19 +- Process/结算申请.bpmn | 6 +- ServerCommands/收益/绑定工时与请款单.json | 42 +- ServerCommands/收益/绑定结算请款单凭证ID.json | 203 +++++ ServerCommands/收益/记录收益变动.json | 215 +++++ Tables/收益/收益变动记录表.json | 9 + Tables/财务/付款凭证表.json | 24 + UserControlPages/收益数据横幅.json | 388 +++------ UserServiceDB.sqlite3 | Bin 552960 -> 585728 bytes 22 files changed, 2190 insertions(+), 846 deletions(-) create mode 100644 Pages/收益/办理结算审批单.json create mode 100644 Pages/收益/办理结算审批单.rd create mode 100644 ServerCommands/收益/绑定结算请款单凭证ID.json create mode 100644 ServerCommands/收益/记录收益变动.json diff --git a/.collaboration b/.collaboration index e3b5c037..e0149782 100644 --- a/.collaboration +++ b/.collaboration @@ -69,16 +69,7 @@ }, { "ModuleName": "Table/任务工时表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T22:57:54.4543761+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\工时\\任务工时表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/流程表文件夹", @@ -195,17 +186,7 @@ }, { "ModuleName": "PCPage/修改报工", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T20:32:27.6447212+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\修改报工.json", - "Pages\\任务\\工时\\修改报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增报工", @@ -393,17 +374,7 @@ }, { "ModuleName": "PCPage/FGC_任务详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T20:19:13.378036+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_任务详情.json", - "Pages\\流程页面文件夹\\FGC_任务详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_审批记录", @@ -799,18 +770,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T19:55:53.7064794+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -1293,16 +1253,7 @@ }, { "ModuleName": "Table/收益变动记录表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T20:50:53.2672351+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\收益\\收益变动记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/收益请款单表", @@ -1342,17 +1293,7 @@ }, { "ModuleName": "UserControlPage/收益数据横幅", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T20:22:02.6830834+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\收益数据横幅.json", - "UserControlPages\\收益数据横幅.rd" - ] + "ModuleType": 31 }, { "ModuleName": "Table/请款单状态", @@ -1368,45 +1309,15 @@ }, { "ModuleName": "PCPage/收益中心", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T20:25:32.6484339+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\收益中心.json", - "Pages\\收益\\收益中心.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/收益中心-变动记录", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T20:26:08.6580347+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\收益中心-变动记录.json", - "Pages\\收益\\收益中心-变动记录.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/收益中心-收益明细", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T20:26:48.4286211+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\收益中心-收益明细.json", - "Pages\\收益\\收益中心-收益明细.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/收益中心-结算申请记录", @@ -1414,45 +1325,15 @@ }, { "ModuleName": "PCPage/收益中心-收益请款记录", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T20:20:46.4832379+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\收益中心-收益请款记录.json", - "Pages\\收益\\收益中心-收益请款记录.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/提交结算申请单", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T19:51:17.2920593+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\提交结算申请单.json", - "Pages\\收益\\提交结算申请单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ProcessItem/结算申请", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T19:49:17.8795215+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\结算申请.json", - "Process\\结算申请.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ServerCommands/收益", @@ -1464,30 +1345,11 @@ }, { "ModuleName": "ServerCommand/绑定工时与请款单", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T19:57:48.8205618+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\收益\\绑定工时与请款单.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/审批结算申请单", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T19:51:26.9357878+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\审批结算申请单.json", - "Pages\\收益\\审批结算申请单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/办理结算申请单", @@ -1495,16 +1357,7 @@ }, { "ModuleName": "Table/付款凭证表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T20:45:35.7922947+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\财务\\付款凭证表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/财务", @@ -1512,32 +1365,14 @@ }, { "ModuleName": "PCPage/办理结算审批单", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T19:43:51.3825264+08:00", "ModuleType": 1 }, { "ModuleName": "ServerCommand/绑定结算请款单凭证ID", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T20:13:57.2767559+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/记录收益变动", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-28T20:43:30.4778455+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/任务/工时/修改报工.json b/Pages/任务/工时/修改报工.json index 04198b03..46bf414d 100644 --- a/Pages/任务/工时/修改报工.json +++ b/Pages/任务/工时/修改报工.json @@ -45,7 +45,7 @@ }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 177.0 + "DesignLengthInPixel": 32.0 } }, "16": { @@ -451,7 +451,7 @@ ], "type": "textarea", "placeholder": "请输入", - "resize": "none" + "resize": "vertical" } }, "20,1": { @@ -563,7 +563,7 @@ "ReloadData": true } ], - "ID": "8525f26d-b11a-4a7e-a860-13c7aeba0e58" + "ID": "73b5b0ab-2b6c-47c3-ad1e-473e25e3b230" }, { "CommandList": [ @@ -578,7 +578,7 @@ "BtnText": "知道了" } ], - "ID": "441b87a5-9db9-4f9c-96c6-38796d1b54c2" + "ID": "5197d6e2-88cf-48df-974c-47aef06a6c70" } ] } @@ -877,7 +877,7 @@ ] } ], - "ID": "c3668a77-2e99-4ad0-98a1-a36780c7d885" + "ID": "838cc4e1-b8f5-4184-aed6-065b7e418d69" }, { "CommandList": [ @@ -894,7 +894,81 @@ ] } ], - "ID": "c1b24b1d-391c-4ab7-8fe5-c6c0279df6e4" + "ID": "0f043355-9fcf-46c2-9454-d730f07ccaf3" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务工时表", + "ColumnName": "请款单ID", + "GUID": "776da76c-2962-421d-9a23-b571402f0720" + } + }, + "value": "%Null%" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务工时表", + "ColumnName": "请款单ID", + "GUID": "c7eda276-47a7-4677-b5f1-09bdfa70f688", + "RelationBinding": { + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "状态" + } + } + }, + "value": "4" + } + ], + "RelationType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=修改报工!18:21" + }, + "Value": true + } + ] + } + ], + "ID": "0c6692e8-b039-4748-8717-b03e721d13af" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=修改报工!18:21" + }, + "Value": false + } + ] + } + ], + "ID": "e0d0d9fb-0c20-4d9d-84c2-4464e7dd3d4c" } ] } @@ -927,4 +1001,4 @@ "Formula": "修改报工!$B$23" } ] -}///zqoX+hScm+UcET/vO/3eChuTSfEEFQMSAv18fneBmrNEDsL3kjKiorzO28iN04CBGjNrNoH76WdFnNWjkfRATVKZnEbfm31IDuAvRkAytPB7EUQ91843uRPdBPXo+0R8NW7i32ocC+So9WNWgvdAfpJPItCBvHx1kD5JtNCY0jSXmQy3s8cfWMPhm8b7tyyzvi3O4SMT/QvP50DnA50gEDxPmI1TA8bOKLeo1XAMWWwAptAsyl+bnD4vfAvsZwjX1C95IAV/vS7CrnZcn6xxjxLXpa5n7GvbcwZ8Sqd8Kr1KB0DPqHI/QO5Ta8XN8bIV6UziGIPa56uAy4DioxjpKuVkjtZR10QGxtcWU4u8qEc24y9YPdyvl0tgu8+f+MmSfTF/a0ziJp6QrDCVhMuxQuJbPMzNSi1rtZ+pOsxG7mgYmaDF5x1GnZj15jxzJM2oynLyJ3Q9vaQfR7R49WQ3rtzMcvJD9EL8ipAAzX8rDINEBAdNv7hNhuJ7Y2yhw89BHD9zmcVKiq2/Zb80qDB4AVq1o0o/XAMi3pIBxA55kvJaHt7G+L9+cMfmU+KUjcC3zHTXR0AdoUEtn83JAJZ9NH5ldYzq9uE+NCM0wjhLtNx0pTmCMIqVaDZLqsBp0Kh1z1jEwZfdzuVprazllSH/A/hPJEhPCGnk7not1TyN9YeL0YR8ws5U/w9YTXTRtgFAhIek0EBNhyKY4U9OcXu/bGCqfLSuZhUU14tK8ghyrKl32kc7BE5Q+zy7a7Nweij963sKuG/44OtQNYEt5r/cEaLNHXOiOLQ0TRXxM3BaKKY/MrEoeuGNPTmXd59Wg0WAZvjET6M+s2DHObHCjNylT6yZ4dt/GbQFkwz9jbGgP7lJD0LUOLQSHLy1Lv8WY/0hFltVfqoTiIdRuT+yB68lw==|920 \ No newline at end of file +}//zZAMsKY7LRnbBVajJ4uBiNQuO41ULIy2D9y07KEejUB2SVO7LNydKHg4A1y2bW6OwJDbrEa2fvLQejYwIilUGqQgi+iruP0yKoX7zEwBZvfbBc7vfRgorbF2rgu63gfaVR+0AWw/cwTDNcVdNA+og+RxEe7TjMeWOZXzTqo/ZebMmGjLHcVCZI5Px9z5pvgsA71u2EUDsL0cMIooW1ZG7psRI58qb67put56GKyv50QBOJekwcscCSBONYxo1yzzzp0U0guBrNb0sPhnf5GuiBEXApICR3w52J1JAfWjVLGWDTW5QBxjJe2CqNtjoSMisSITDcjTlReyDjF/0PdtF0Vau4OSrlYTLfe6/SiJIJxKHFJIpmn9xQKKNMQHu0XfBOCAOJer+RQMqkaT77kV1yguHA4Gg5E08zws7bQVImYOzScLlrVd7EWZrNEnhtaM051oFGhiPzi6xhB2T77RzxtXlHdP93e5z+669QqYA9ptkHz7IeW1kNt4e3AKJKMdbLofY4LBGDwkTGSjrczltUd94g3Y3i1w9vXPrH9bWwZ0iwlNCsOM2eu8XYMYmbo6CMrArSETJbiktcMACsJduJQkx5kT4bwt9LDXmAwScHao8efptQ4qYNtelKZsNdDyTVGwXdzaKqUazIHKSBtCLXQphyf61yE235d7r130pPYnqWGDa+15urzdpSorCEPcHY25fSlBhnfToVt3BJDpneMMHWKaiLJiD0cMEuYwOFDVKB4Vrqr2dhdlGVVfp6mAS/hZD1vEaetiOMNEtcaBjFwbARw46h3c0K/4LM2GN+JwOjFpHV6yA7B0b15pOEdanADlp6fDtlzu4UmG1EUtPY4H1RTy7NHtDDBN6c2PINeFEu+j+ThRmZxfIOAusVFAAeyWDo2/XMsrDXSZVaUkEg==|920 \ No newline at end of file diff --git a/Pages/收益/办理结算审批单.json b/Pages/收益/办理结算审批单.json new file mode 100644 index 00000000..3bc6a322 --- /dev/null +++ b/Pages/收益/办理结算审批单.json @@ -0,0 +1,775 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 77.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 18 + ], + "Count": 19, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + } + }, + "Count": 30, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "申请日期", + "1,8": "请款人", + "1,16": "应付金额", + "2,8": "%CurrentUser.UserName%", + "2,16": 0, + "4,1": "户名", + "4,16": "付款日期", + "7,1": "开户行", + "7,16": "付款科目", + "10,1": "帐号", + "10,16": "实际付款金额", + "13,1": "备注", + "13,16": "付款凭证" + }, + "Formulas": { + "11,16": "总金额", + "5,16": "TODAY()" + }, + "AttachInfos": { + "2,1": { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "请款日期", + "GUID": "2f97cc8d-14ee-4f61-92bc-00e50f38453b" + } + }, + "2,8": { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "请款人", + "GUID": "036f1a89-48ec-4d26-b98d-1c0b20bbcfa6", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + } + }, + "2,16": { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "总收益", + "GUID": "c8e63e7c-7996-4acc-bfbf-6348055280e6" + } + }, + "5,1": { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "户名", + "GUID": "0d5f791f-a302-415d-9290-142e2a886d67" + } + }, + "5,16": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "付款日期", + "GUID": "01f50b73-51a1-4ce4-99f2-ab54374b1991" + }, + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "date", + "placeholder": "请输入", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "firstDayOfWeek": 1, + "DefautWeekFormat": "yyyy 第 WW 周" + } + }, + "8,1": { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "开户行", + "GUID": "a3e03bd8-8a6c-4cb3-9b09-5bc822ab29d7" + } + }, + "8,16": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "付款科目", + "GUID": "279bf702-7891-4fff-8f47-1988de498a06" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "工资", + "options": [ + { + "value": "工资", + "label": "工资" + }, + { + "value": "报销", + "label": "报销" + }, + { + "value": "其他", + "label": "其他" + } + ], + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "11,1": { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "帐号", + "GUID": "74744b0a-0d88-45ce-8c65-4db55ad744c3" + } + }, + "11,16": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "付款金额", + "GUID": "0d6b4c49-08a9-49e9-9e9d-2724d28637f5" + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "min": 0, + "step": 1, + "placeholder": "请选择", + "controls": false + } + }, + "14,1": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "备注", + "GUID": "722a1224-c9ea-4dd2-b32a-ec08731b670f" + }, + "CellType": { + "$type": "Forguncy.MultilineTextBox, ServerDesignerCommon", + "TemplateKey": "_RS_NewLittleRoundCorner", + "CommandList": [] + } + }, + "14,16": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "付款凭证", + "GUID": "06ef6b82-916e-441d-aafa-7567f3046357" + }, + "CellType": { + "$type": "ElementUI.UploadCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "accept": ".jpg, .jpeg, .png", + "buttonText": "点击上传", + "tipText": "只能上传jpg/png文件" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontSize": -1.0 + }, + { + "FontFamily": 0, + "FontSize": 14.666666666666666, + "Formatter": 2 + }, + { + "BorderRight": 0 + }, + { + "FontFamily": 0, + "FontSize": 14.666666666666666, + "Foreground": 4, + "Formatter": 5, + "HorizontalAlignment": 6 + }, + { + "FontFamily": 0, + "FontSize": 14.666666666666666 + }, + { + "FontFamily": 0, + "FontSize": 14.666666666666666, + "Formatter": 7, + "VerticalAlignment": 8, + "WordWrap": true + }, + { + "Formatter": 7 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General", + "yyyy\"年\"m\"月\"d\"日\";@", + "Background 2 -10", + "#FFFF0000", + "¥#,##0_);[Red](¥#,##0)", + "Left", + "@", + "Top" + ], + "Borders": [ + { + "Color": 3 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,2": 1, + "1,3": 1, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 0, + "1,9": 1, + "1,10": 1, + "1,11": 1, + "1,12": 1, + "1,13": 1, + "1,16": 0, + "2,0": 2, + "2,1": 3, + "2,2": 1, + "2,3": 1, + "2,4": 1, + "2,5": 1, + "2,6": 1, + "2,7": 1, + "2,8": 3, + "2,9": 1, + "2,10": 1, + "2,11": 1, + "2,12": 1, + "2,13": 1, + "2,14": 4, + "2,15": 1, + "2,16": 5, + "3,1": 1, + "3,2": 1, + "3,3": 1, + "3,4": 1, + "3,5": 1, + "3,6": 1, + "3,7": 1, + "3,8": 1, + "3,9": 1, + "3,10": 1, + "3,11": 1, + "3,12": 1, + "3,13": 1, + "3,14": 4, + "4,1": 1, + "4,2": 1, + "4,3": 1, + "4,4": 1, + "4,5": 1, + "4,6": 1, + "4,7": 1, + "4,8": 1, + "4,9": 1, + "4,10": 1, + "4,11": 1, + "4,12": 1, + "4,13": 1, + "4,14": 4, + "4,16": 1, + "4,17": 1, + "4,18": 1, + "4,19": 1, + "4,20": 1, + "4,21": 1, + "4,22": 1, + "4,23": 1, + "4,24": 1, + "4,25": 1, + "4,26": 1, + "4,27": 1, + "4,28": 1, + "5,1": 6, + "5,2": 1, + "5,3": 1, + "5,4": 1, + "5,5": 1, + "5,6": 1, + "5,7": 1, + "5,8": 1, + "5,9": 1, + "5,10": 1, + "5,11": 1, + "5,12": 1, + "5,13": 1, + "5,14": 4, + "5,16": 6, + "6,1": 6, + "6,2": 6, + "6,3": 6, + "6,4": 6, + "6,5": 6, + "6,6": 6, + "6,7": 1, + "6,8": 1, + "6,9": 1, + "6,10": 1, + "6,11": 1, + "6,12": 1, + "6,13": 1, + "6,14": 4, + "7,1": 0, + "7,2": 1, + "7,3": 1, + "7,4": 1, + "7,5": 1, + "7,6": 1, + "7,7": 1, + "7,8": 1, + "7,9": 1, + "7,10": 1, + "7,11": 1, + "7,12": 1, + "7,13": 1, + "7,14": 4, + "7,16": 0, + "7,17": 1, + "7,18": 1, + "7,19": 1, + "7,20": 1, + "7,21": 1, + "7,22": 1, + "7,23": 1, + "7,24": 1, + "7,25": 1, + "7,26": 1, + "7,27": 1, + "7,28": 1, + "8,1": 6, + "8,2": 1, + "8,3": 1, + "8,4": 1, + "8,5": 1, + "8,6": 1, + "8,7": 1, + "8,8": 1, + "8,9": 1, + "8,10": 1, + "8,11": 1, + "8,12": 1, + "8,13": 1, + "8,14": 4, + "8,16": 6, + "9,1": 1, + "9,2": 1, + "9,3": 1, + "9,4": 1, + "9,5": 1, + "9,6": 1, + "9,7": 1, + "9,8": 1, + "9,9": 1, + "9,10": 1, + "9,11": 1, + "9,12": 1, + "9,13": 1, + "9,14": 4, + "10,1": 0, + "10,2": 1, + "10,3": 1, + "10,4": 1, + "10,5": 1, + "10,6": 1, + "10,7": 1, + "10,8": 1, + "10,9": 1, + "10,10": 1, + "10,11": 1, + "10,12": 1, + "10,13": 1, + "10,14": 4, + "10,16": 0, + "10,17": 1, + "10,18": 1, + "10,19": 1, + "10,20": 1, + "10,21": 1, + "10,22": 1, + "10,23": 1, + "10,24": 1, + "10,25": 1, + "10,26": 1, + "10,27": 1, + "10,28": 1, + "11,1": 6, + "11,2": 1, + "11,3": 1, + "11,4": 1, + "11,5": 1, + "11,6": 1, + "11,7": 1, + "11,8": 1, + "11,9": 1, + "11,10": 1, + "11,11": 1, + "11,12": 1, + "11,13": 1, + "11,14": 4, + "11,16": 6, + "12,1": 1, + "12,2": 1, + "12,3": 1, + "12,4": 1, + "12,5": 1, + "12,6": 1, + "12,7": 1, + "12,8": 1, + "12,9": 1, + "12,10": 1, + "12,11": 1, + "12,12": 1, + "12,13": 1, + "12,14": 4, + "13,1": 0, + "13,2": 1, + "13,3": 1, + "13,4": 1, + "13,5": 1, + "13,6": 1, + "13,7": 1, + "13,8": 1, + "13,9": 1, + "13,10": 1, + "13,11": 1, + "13,12": 1, + "13,13": 1, + "13,14": 4, + "13,16": 0, + "13,17": 1, + "13,18": 1, + "13,19": 1, + "13,20": 1, + "13,21": 1, + "13,22": 1, + "13,23": 1, + "13,24": 1, + "13,25": 1, + "13,26": 1, + "13,27": 1, + "13,28": 1, + "14,1": 7, + "14,14": 4, + "14,16": 6, + "15,14": 4, + "16,14": 4, + "17,1": 6, + "17,2": 6, + "17,3": 6, + "17,4": 6, + "17,5": 6, + "17,6": 6, + "17,7": 6, + "17,8": 6, + "17,9": 6, + "17,10": 6, + "17,11": 6, + "17,12": 6, + "17,13": 6, + "18,1": 2, + "18,2": 2, + "18,3": 2, + "18,4": 2, + "18,5": 2, + "18,16": 8 + }, + "SheetStyle": { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "5,16,1,13", + "8,16,1,13", + "11,16,1,13", + "2,16,1,13", + "11,1,1,13", + "2,1,1,6", + "8,1,1,13", + "5,1,1,13", + "2,8,1,6", + "14,16,3,13", + "14,1,3,13" + ], + "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": {} + }, + "CustomNames": [ + { + "Name": "总金额", + "Formula": "办理结算审批单!$Q$3" + } + ] +}//nIPp6wcfj6qdKYqPfaA2aQcQfKgCUZ/9waoG7/j9Eis6kBAK+OoK/C7rbrH3Zb6eSSiyUi+4r9tuQntQ84s8tpDbw1SfkyfklcXv6751mWOqKNFLmxlHTqFT6/ZfORJ9808A8G5WpEIR4rcaQndaoB7GGUQGlq6eBeOog6WDgRAMfgx7GprQc49+yxblhXk8oEDgzsmfabG9bxjhrFuoOhU+6a5O3W9EFtBm8i2AH06MjJ1k2c0q6aAbWOFNEiqhu7HDMr1l2IPlv8qBHohXPsQWsoJ3k0URw7OAQPWYG4y95Ao4mNqzlUiq5n1OmY3xEoDQlFBmnNhcZhRR+pLZ0ky365pc0a8NhI9ZnzbQ0+qL3pLosTthgUZIYK+JpEBhc+7/3oybH++gKD6EsM3wQSKtDDYz3lVWdq5Khg9WO6Z/L/1FAXUa1Z+vvNMFdzahROpe3IMgRyCp3ZP08zVIGtIDPN5rlKRAzGTDU7opWbhCH43CZLpsrScm3/qVOn96vyqKqvO9Uo2KvbXlTrIU4Hm9yKJsIPcgNVYCUdCcPU/jV3G0Pbt5RbJ3XlFYSbP4AGsZIdTLaeeMa+PcrE6e8X4Z82Hg6KLSVcHeF43gWwJou5S0MeUyNxiE4bl6+AzyXssuO+DukcPgtEb5qCY92EA0r3IAMoXEg20/5vITwj92C9V9HE9E8ukcar5fZkQNXrOxy3Phja8wgs6Dy800iU6014t+4hivjXLKQMpRHN9N1x6ExPRa6zy3+8TxhCpzC2I15hdQ5tYBJcyPWoTtjDRUkwoWtWjT18GCDFH/ifrBArPI26kO0rUDPNSTa4SA4gK2rh/BFG3bnscvahbOeET167Gf+6c3gOp6q4nQVZNOTt8ohpBv1PnIfWXpOrSXBFYKcTnpqoD9Co870izDgA==|920 \ No newline at end of file diff --git a/Pages/收益/办理结算审批单.rd b/Pages/收益/办理结算审批单.rd new file mode 100644 index 00000000..b96d5aa3 --- /dev/null +++ b/Pages/收益/办理结算审批单.rd @@ -0,0 +1,15 @@ +{ + "PageType": 0, + "ColumnCount": 30, + "RowCount": 19, + "Formulas": { + "11,16": "总金额", + "5,16": "TODAY()" + }, + "CustomNames": [ + { + "Name": "总金额", + "Formula": "办理结算审批单!$Q$3" + } + ] +} \ No newline at end of file diff --git a/Pages/收益/审批结算申请单.json b/Pages/收益/审批结算申请单.json index 5e5cf066..1adffc7c 100644 --- a/Pages/收益/审批结算申请单.json +++ b/Pages/收益/审批结算申请单.json @@ -83,19 +83,13 @@ }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, @@ -184,14 +178,7 @@ }, "35": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 303.0 } } }, @@ -348,22 +335,6 @@ }, "ColumnName": "提成系数" }, - { - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "计划工时", - "GUID": "08b47d9c-5c3c-457e-b73a-529f644a9918" - }, - "ColumnName": "计划工时" - }, - { - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "实际工时", - "GUID": "c54c55bb-7e42-4bcd-931c-7b2fbedfab49" - }, - "ColumnName": "实际工时" - }, { "BindingInfo": { "TableName": "View_任务工时统计", @@ -472,24 +443,6 @@ "headerAlign": "center", "key": "a849e367-79e0-45ad-9a9a-285a0f1abb3f" }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "计划工时", - "label": "计划工时", - "width": 120, - "align": "center", - "headerAlign": "center", - "key": "d095c4f5-87d2-4315-aa33-311eb6ae3123" - }, - { - "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "实际工时", - "label": "实际工时", - "width": 120, - "align": "center", - "headerAlign": "center", - "key": "3fa6e11b-961e-42ba-ae95-79391122f1bc" - }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "核定工时", @@ -526,7 +479,7 @@ } ], "sumText": "合计", - "size": "default", + "size": "small", "showSelectColumn": true } }, @@ -934,4 +887,4 @@ "Formula": "审批结算申请单!$S$2" } ] -}//1LW0RLmU2WSRHkqvvxA2FKw2lPW2/75XeOhDJPEhwB2kpJqVwqBIAA8Nc5eJZH3NsXAe8393ud0upRcGxdAcbYctzaNJEHsy882Yu5U6B5QOEl0FHhY9kL+MYIVUEsc1pniHqyFf7uP9qtvS41QVZc24bTgV1j1ZLweHbjspnzkIH9zSgs4RP0405O/x4YnpdZ4BUXR0VDo7ZkSUKPf5adDzUNA3IoK1GKFWw29Y3htkEEht7JFzsqJQofNjx53oqO/574Y0wnOEmINDuSidYt6xxyUm3KLlr531e8f9VdCkK4/gCMNty3XM7ShNuUWh+wJNSpEMC8TtN9S09JxUwXfzCrUK/whPU1loDQaZ10Og9FnbYNnmOlKEP1/6uQcsdLqmwzv3uxo+SVZczH1qSflOQc9Jg06v4jGquO8pj2V90UMIQ3zOZer2PnCZ2IWTr4+CMAP6zmIZQAQ1tURWaG8ivhQ9+k5lJ6cb8Z97PThQQxvTF38we6t12f82zaWba7y886Gv9HI3zZkGOx7UonVp2EAjNc+892huqZowfvpjofqlZXmS/UiCt7Pr184OD6dQEY58lQ+cIfqGTPpjZGk0A4cYnQqaxWVau/HFJMeOPmHGDdNpqxxwGriDYpCcsALyHSSoFgZH6ZGW+FQnfcy2BxWqejPteDuInwnJmbscUSib6IcqTbjnPlyq7ZMcdRbsycRtM2CNIiBo71ppO905HYlFr6Qh2k6UF4/MNv3tTZNEJ2FKTxEy8MRfEpa6r1Jq/kRWDQvEWZM/6Kty0AhdswzIdhfoZ/yaCWsDkJ70lVcsiI3ZV1jCsEkAElQSALMLi6EJ64FzL/9IQX3G7CIe4AHbBlt0Zztcig6TOag2KH6b1C5Mo/3jLrzpTef6kOVA+diFOyrErr09m7dH5A==|920 \ No newline at end of file +}//Brq9xaWAC9ZUSyXOB9L8jBIbo2+LUdC6q0eVuOc6HjgMD5xGG2ZPOvFJPpsq7mMpK24dY/dUHF0aSfrm5i9yLXrpvtv2C/FJCNPDB/dbIaet/uOLxj9tBsIdvz8URR7n1xlF9ca5I2OPDEL1H9Nmw6+kA5aGqLqNofxIpp87g40aARNQg5zSYz/gjgzq9FqBbc3+/ozzzEYUmWCBv8yW/uPjRHrbn0jStKcAjYV6IS3e3UGI9Tk0NZLjzoDZlo9a3ob93Pg2D4GF4CIZhVnf0YGS7bvwPnyyChrcJyHO6F3L1NllHE9pEc6a/ou4VIqAAVfsLSh3oT5ycKxET77UVkRjrpvaNaI5ILsM7GYuHNbmvVgHoxzQFcpsihUiv0mgk/Jqw+2qy9NqPM4Kmp4Goyo/aDjHxHu34jlpR4epPRoXYAtgBLeaJxZGIqDxVlRk8jDUQwUaRLu2McsZjCHaVSNS8sQr1SzDPkXNuloqMMHpIAQta8+B0O/iX9AwFJ64xPC4IWbtV52nkaAtAhgEC+TQCXHoSj+NrNF/V7qxSIaWLFUqZ9lyDcbfZ47tYco1a2+VCW4w7G95/5zlGIfHr93Zr59LZVdqCZHSyeAatICcD8rO0v/gpPW91uRQJEael05LPJxTn9gOu7CembPMI4vtmgNw60Y8JLPLXnfpjVSogUHdj5e8pYPmcdeXknbdcICp8FXBVwAYU6mkDOGpzvCVmhPhXoaqPNC7TYZvZi6BnnzV14vi+nD02TOgGi9xwy/LW9C0fw1iL7bRaumEPzf3VkskflnOr/NDoqG2AExqE8nNBFpxBROizwgjtDyUAbcGTR++YJjBmgW0KHlSPb8mSxy+gCIIIkMDwF9EzIhjF2v62Tq62fJ8SRdYq6KuXpEjYeRJ5njIoxSdifzbnw==|920 \ No newline at end of file diff --git a/Pages/收益/提交结算申请单.json b/Pages/收益/提交结算申请单.json index 5710e3aa..20a7cdee 100644 --- a/Pages/收益/提交结算申请单.json +++ b/Pages/收益/提交结算申请单.json @@ -3,7 +3,7 @@ "RowColumnAttachedInfos": { "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 18.0 } }, "3": { @@ -88,14 +88,7 @@ }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "24": { @@ -187,7 +180,7 @@ "DesignLengthInPixel": 24.0 } }, - "35": { + "39": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -200,7 +193,7 @@ } } }, - "Count": 40, + "Count": 44, "DefaultSize": 32.0 }, "Values": { @@ -234,10 +227,10 @@ "MethodName": "GetSelectedRange", "RetrunParamNames": { "StartValue": { - "SerializeProperty": "=提交结算申请单!B25" + "SerializeProperty": "=提交结算申请单!开始日期" }, "EndValue": { - "SerializeProperty": "=提交结算申请单!F25" + "SerializeProperty": "=提交结算申请单!结束日期" } } } @@ -281,11 +274,11 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "计算总金额", "ParameterValue": "0", - "ID": "e8adfb57e0464aaca34a886178aaffa6" + "ID": "cfe9f066a88b4f599aaaf650dee8ebe0" }, { "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", - "JavaScript": "/**\r\n * 计算 JSON 数组中指定属性的总和\r\n * @param {Array} jsonArray - 包含对象的 JSON 数组\r\n * @param {string} propertyName - 要计算总和的属性名称\r\n * @returns {number} - 属性值的总和\r\n */\r\nfunction calculateSum(jsonArray, propertyName) {\r\n let sum = 0;\r\n if (Array.isArray(jsonArray)) {\r\n for (const item of jsonArray) {\r\n if (item.hasOwnProperty(propertyName)) {\r\n const propertyValue = parseFloat(item[propertyName]);\r\n if (!isNaN(propertyValue)) {\r\n sum += propertyValue;\r\n }\r\n }\r\n }\r\n }else{\r\n console.log(\"传入的参数不是JSON数组\")\r\n }\r\n\r\n return sum;\r\n}\r\nvar data = Forguncy.CommandHelper.getVariableValue(\"选择项\")\r\nconst totalPrices = calculateSum(data, \"收益\");\r\nForguncy.CommandHelper.setVariableValue(\"计算总金额\", totalPrices);\r\n", + "JavaScript": "/**\r\n * 计算 JSON 数组中指定属性的总和\r\n * @param {Array} jsonArray - 包含对象的 JSON 数组\r\n * @param {string} propertyName - 要计算总和的属性名称\r\n * @returns {number} - 属性值的总和\r\n */\r\nfunction calculateSum(jsonArray, propertyName) {\r\n let sum = 0;\r\n if (Array.isArray(jsonArray)) {\r\n for (const item of jsonArray) {\r\n if (item.hasOwnProperty(propertyName)) {\r\n const propertyValue = parseFloat(item[propertyName]);\r\n if (!isNaN(propertyValue)) {\r\n sum += propertyValue;\r\n }\r\n }\r\n }\r\n }else{\r\n console.log(\"传入的参数不是JSON数组\")\r\n }\r\n\r\n return sum;\r\n}\r\n\r\nvar data = Forguncy.CommandHelper.getVariableValue(\"选择项\");\r\nconst totalPrices = calculateSum(data, \"收益\");\r\nForguncy.CommandHelper.setVariableValue(\"计算总金额\", totalPrices);\r\n", "ID": "fd1b9ad310804ff3a5a3c2fbbddd8369" }, { @@ -381,7 +374,7 @@ "ColumnName": "工时核定方式", "GUID": "566af42b-e314-40c8-8af8-78edf75bc218" }, - "ColumnName": "工时核定方式" + "ColumnName": "核定方式" }, { "BindingInfo": { @@ -454,7 +447,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=提交结算申请单!B25" + "SerializeProperty": "=提交结算申请单!开始日期" } }, { @@ -467,7 +460,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=提交结算申请单!F25" + "SerializeProperty": "=提交结算申请单!结束日期" } }, { @@ -637,7 +630,7 @@ } ], "sumText": "合计", - "size": "default", + "size": "small", "showSelectColumn": true } }, @@ -952,16 +945,13 @@ "GUID": "96d4091b-c244-4022-9489-75c9c70f8277" }, "CellType": { - "$type": "Forguncy.NumberCellType, ServerDesignerCommon", + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], "TemplateKey": "_RS_NewLittleRoundCorner" - }, - "DataValidationInfo": { - "IgnoreBlank": false, - "ErrorMessage": "至少选择一行", - "ErrorTo": 1, - "ErrorToTargetCell": { - "SerializeProperty": "=提交结算申请单!N2" - } } } }, @@ -1010,6 +1000,13 @@ { "FontFamily": 0, "FontSize": 14.666666666666666 + }, + { + "Background": 9, + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 10, + "HorizontalAlignment": 11 } ], "Types": { @@ -1022,7 +1019,10 @@ "[AUTO]General", "¥#,##0_);[Red](¥#,##0)", "Left", - "yyyy\"年\"m\"月\"d\"日\";@" + "yyyy\"年\"m\"月\"d\"日\";@", + "#FFFFFF00", + "@", + "Center" ], "Borders": [ { @@ -1133,7 +1133,7 @@ "23,11": 9, "23,12": 9, "23,13": 9, - "24,1": 0 + "24,1": 10 }, "SheetStyle": { "FontFamily": 0, @@ -1148,9 +1148,11 @@ "14,1,1,13", "11,1,1,13", "20,1,3,13", - "3,16,20,23", - "1,23,1,16", + "3,16,20,27", + "1,23,1,20", "1,18,1,5", + "24,9,1,3", + "24,12,1,3", "24,1,1,8" ], "PageInfo": { @@ -1194,7 +1196,7 @@ "Fill": "Accent 1 0" }, "IsAutomaticFill": false, - "Location": "18,183", + "Location": "18,186", "Size": "3,18" } ], @@ -1206,6 +1208,14 @@ { "Name": "总金额", "Formula": "提交结算申请单!$S$2" + }, + { + "Name": "开始日期", + "Formula": "提交结算申请单!$J$25" + }, + { + "Name": "结束日期", + "Formula": "提交结算申请单!$M$25" } ] -}//f1YP+BU715a9otrULeVpKRGwTI1lJY4gqQ3aBWZPRzMV9R9FOeyQuRLSnlbahIUsoc2wwVTl55w0BvKDrlq1LWQ8PNY9k+D53oFsu54w44l+bN8JhfUsICqYaakvSRiu+w7BFWMKbJhl4VA9D4tNO/Y4gXVrUhgHcxcttgGNRG9McjDD2z1pHNtuLm5o7hl85WtzpQlVC8zxJ1misDyz431hfBhAboxao8feTAmYYT+cLCeN6J5iE/6JAnzgWUCnEOcB3HmvhQTlcIcoxZxSa8QvfPQY05lwLgLxYXuQBC/pGPTdm/ueMufAivmS7aGDpXspfz6r1PKUC/qushu5Xwm4prv3uoqUjBwWJq5v03GZH02Ww5XS0LjXmwElqa6Q79DsjyxSxyEMzXjt8crO2cnHupj6aY+u0Axlwj5c9ECb4A0OvGSfDT3TuLcQPLyNhoQGKvhiL54tGQSd4MrHAdd1UFWGRXEezpBM6ZX9WIfScRvqtdwtR67g5YNCgJD9cRIpQkm7OPE/oEuswLSyurgmAN72iUw9HeLB78fbu4/nwrTlJSJf6maoxyyN4ikWQyUI3Htc+ySu7cpJdftzpY+rt40m6uhqdlwX7I8CfUIV1rwbSycuxofzcMgV2aos7dDUmD1aEx7aSxMh1VVjq6RrYHv7mmdGrdcRl115Af9u2pUXPnDCQsDIykME6Qrr8TD+eLWa5pi+BjyLt7iGvpJUHWyf8UvbwxMfxgqN972a5+4uNQhPs6g7ai4qlwDMEJb6mbQJxraeCbwYu7QfK4pTjYEUCgBMBkvkQcBcaRsOB4SRhaHZKozWaQN3t/P1hrXIQ7rAerFqzmdrk8VFIKxE57jQQjY6fhC1zlQmLuBi9K1dYtK1/v763nXxMb7qvgpBSHiwLRX2Cp+JXdoQ2g==|920 \ No newline at end of file +}//u+HP5HCRVUFNMrTfhRAK8PlBTQw7onvVEuRuvJyLoz6X/MEL12BCMR/611JNLg7xFSvSz3V6aB/BuH+2MJc9P2S0EQPS+4i1+rMmwx0Q4UlI175dEiK14RHRFOLWD3seyvursk5Ze1ktjtjgUC0FI0QidI3CREK4p9TraETG8jTtgTM7ffvQk8CYTl/7QamVNkDKQILIkoas8730ypxTAjeV8vfuxpSCYQBluEIys9yvrt2sAN25HjtRfmOQQK59i9aPMK6EUL//9N2q8VbA/Scsa+EspuVaEKklyqMuL8tt0FGQsTit+mD390EwFl15iUH2Kni2zWPu2/2zHP7elL8IjOBQa6dcKnZ31SHv0wreMzU0qg4diu9E0n7/uYVmljOhYu9/A97HjdPswAkkdckBKt2CEvDNsQ2YRn6Qkh5eiKP8CYvwDTp/9ZUwj/U9YSi0y8eSrxxT6yNyZBmX8MZjcW5lklRaAALcvTP4eIY9vLqNAzkyvfBQDkecu/Q+I3oAU8HSRV4FLNqvC1kFt8yqxhZSZEm55lML0zdmHuX1qXd3QRLQfHeAS9oWYvsf74PkHJ5DCgUqu9L+BBRXjQEreTxZd+EM092apCmyaJbFX9YYvtTmSW3zrkb9p6FuUTNnZNBbWEVG4RVeCBMpx7pSe/pS68+jW3bJpCOGcSjjtDlfSmWPXRUM/BGUWhkKzaepPJ2l+ul2f4KKtax9W9Fa21XTknDorHbhavIFdmDMmNiAI/A+NsAsQxG7GNLUq8Eun/n+f3cxTPOEmpTAGQuLxSs4Bg25y299jex6sVQsC1n2y1+M9lJHkHepvQH7+4Xlp+FY7pGNJEyInYUTzAVWxoCm3VMyXeoI/j7l+zWyPmUdpDqBIngXEDTZimF+Zn1w+QCiTl48efzEhKxXbg==|920 \ No newline at end of file diff --git a/Pages/收益/提交结算申请单.rd b/Pages/收益/提交结算申请单.rd index 0e99c9f1..9f4c9ba5 100644 --- a/Pages/收益/提交结算申请单.rd +++ b/Pages/收益/提交结算申请单.rd @@ -1,6 +1,6 @@ { "PageType": 0, - "ColumnCount": 40, + "ColumnCount": 44, "RowCount": 25, "Formulas": { "4,1": "TODAY()" @@ -13,6 +13,14 @@ { "Name": "总金额", "Formula": "提交结算申请单!$S$2" + }, + { + "Name": "开始日期", + "Formula": "提交结算申请单!$J$25" + }, + { + "Name": "结束日期", + "Formula": "提交结算申请单!$M$25" } ] } \ No newline at end of file diff --git a/Pages/收益/收益中心-变动记录.json b/Pages/收益/收益中心-变动记录.json index cf374200..c152f65e 100644 --- a/Pages/收益/收益中心-变动记录.json +++ b/Pages/收益/收益中心-变动记录.json @@ -3,32 +3,42 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 15.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 30.0 } }, "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 293.0, "Mode": 1 } }, - "3": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } }, - "4": { + "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 34.0, "Mode": 1 } }, - "5": { + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "7": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -36,10 +46,10 @@ } }, "InLogicalVisibleIndexes": [ - 5 + 7 ], - "Count": 6, - "DefaultSize": 30.0 + "Count": 8, + "DefaultSize": 15.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -215,13 +225,13 @@ "DefaultSize": 32.0 }, "Values": { - "0,1": "变动记录" + "1,1": "变动记录" }, "Formulas": { - "0,34": "IF(C6,H6,G6)" + "1,34": "IF(C8,H8,G8)" }, "AttachInfos": { - "0,34": { + "1,34": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -231,11 +241,11 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='收益中心-变动记录'!C6" + "SerializeProperty": "='收益中心-变动记录'!C8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('收益中心-变动记录'!C6)" + "SerializeProperty": "=NOT('收益中心-变动记录'!C8)" } } ] @@ -247,7 +257,7 @@ "UseCellForeColor": true } }, - "2,1": { + "3,1": { "CellType": { "$type": "ElementUI.TableCellType, ElementUI", "ElTableName": "EL表格1", @@ -323,22 +333,61 @@ }, "CustomColumns": [] }, - "columns": [], + "autoGenerateColumnsByDataSource": false, + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "日期", + "label": "日期", + "formatStr": "yyyy/MM/dd", + "align": "center", + "headerAlign": "center", + "key": "a939cf87-a11b-4a4f-a382-69a98ff61f37" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "经手人", + "label": "经手人", + "align": "center", + "headerAlign": "center", + "key": "428a5a38-3f4a-4739-999d-71aad1deb536" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "来源", + "label": "来源", + "align": "center", + "headerAlign": "center", + "key": "ce92741c-a573-4feb-b5ba-efb700514ee3" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "金额", + "label": "金额", + "formatStr": " ¥#,##0.00_)", + "align": "center", + "headerAlign": "center", + "key": "62d0ab20-9402-46c2-83ab-d8a05d263c4a" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "备注", + "label": "备注", + "align": "center", + "headerAlign": "center", + "key": "35e484ab-4114-47cf-8226-c7385cf0b4f7" + } + ], + "showActionButtons": true, "actionButtons": [ { "$type": "ElementUI.ActionButton, ElementUI", "type": "button", - "Name": "编辑", - "shape": "default" - }, - { - "$type": "ElementUI.ActionButton, ElementUI", - "type": "button", - "Name": "删除", - "styleType": "Accent 5", + "Name": "查看", "shape": "default" } ], + "operationColumnWidth": 100, "sumText": "合计", "size": "small", "showIndexColumn": true, @@ -346,7 +395,7 @@ "stripe": false } }, - "4,1": { + "5,1": { "CellType": { "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", "AttachElementTable": true, @@ -395,7 +444,7 @@ "hideOnSinglePage": true } }, - "5,2": { + "7,2": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "收起", @@ -407,11 +456,11 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='收益中心-变动记录'!2:5" + "SerializeProperty": "='收益中心-变动记录'!3:6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('收益中心-变动记录'!C6)" + "SerializeProperty": "=NOT('收益中心-变动记录'!C8)" } } ] @@ -419,7 +468,7 @@ ] } }, - "5,6": { + "7,6": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "ToolTip": "收起", @@ -428,7 +477,7 @@ "UseCellForeColor": true } }, - "5,7": { + "7,7": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "ToolTip": "收起", @@ -498,74 +547,107 @@ ] }, "CellStyles": { - "0,1": 0, - "0,34": 1, - "2,1": 2, + "1,1": 0, + "1,34": 1, "3,1": 2, - "3,2": 2, - "3,3": 2, - "3,4": 2, - "3,5": 2, - "3,6": 2, - "3,7": 2, - "3,8": 2, - "3,9": 2, - "3,10": 2, - "3,11": 2, - "3,12": 2, - "3,13": 2, - "3,14": 2, - "3,15": 2, - "3,16": 2, - "3,17": 2, - "3,18": 2, - "3,19": 2, - "3,20": 2, - "3,21": 2, - "3,22": 2, - "3,23": 2, - "3,24": 2, - "3,25": 2, - "3,26": 2, - "3,27": 2, - "3,28": 2, - "3,29": 2, - "3,30": 2, - "3,31": 2, - "3,32": 2, - "3,33": 3, "4,1": 2, - "5,1": 4, - "5,2": 4, - "5,5": 5, - "5,6": 6, - "5,7": 6, - "5,8": 5, - "5,9": 5, - "5,10": 5, - "5,11": 6, - "5,12": 4, - "5,13": 4, - "5,14": 4, - "5,15": 4, - "5,16": 7, - "5,17": 7, - "5,18": 7, - "5,19": 7, - "5,20": 7, - "5,21": 7, - "5,22": 6, - "5,23": 4, - "5,24": 4, - "5,25": 4, - "5,26": 4, - "5,27": 3, - "5,28": 3, - "5,29": 3, - "5,30": 3, - "5,31": 3, - "5,32": 3, - "5,33": 3 + "4,2": 2, + "4,3": 2, + "4,4": 2, + "4,5": 2, + "4,6": 2, + "4,7": 2, + "4,8": 2, + "4,9": 2, + "4,10": 2, + "4,11": 2, + "4,12": 2, + "4,13": 2, + "4,14": 2, + "4,15": 2, + "4,16": 2, + "4,17": 2, + "4,18": 2, + "4,19": 2, + "4,20": 2, + "4,21": 2, + "4,22": 2, + "4,23": 2, + "4,24": 2, + "4,25": 2, + "4,26": 2, + "4,27": 2, + "4,28": 2, + "4,29": 2, + "4,30": 2, + "4,31": 2, + "4,32": 2, + "4,33": 3, + "5,1": 2, + "6,1": 2, + "6,2": 2, + "6,3": 2, + "6,4": 2, + "6,5": 2, + "6,6": 2, + "6,7": 2, + "6,8": 2, + "6,9": 2, + "6,10": 2, + "6,11": 2, + "6,12": 2, + "6,13": 2, + "6,14": 2, + "6,15": 2, + "6,16": 2, + "6,17": 2, + "6,18": 2, + "6,19": 2, + "6,20": 2, + "6,21": 2, + "6,22": 2, + "6,23": 2, + "6,24": 2, + "6,25": 2, + "6,26": 2, + "6,27": 2, + "6,28": 2, + "6,29": 2, + "6,30": 2, + "6,31": 2, + "6,32": 2, + "6,33": 2, + "7,1": 4, + "7,2": 4, + "7,5": 5, + "7,6": 6, + "7,7": 6, + "7,8": 5, + "7,9": 5, + "7,10": 5, + "7,11": 6, + "7,12": 4, + "7,13": 4, + "7,14": 4, + "7,15": 4, + "7,16": 7, + "7,17": 7, + "7,18": 7, + "7,19": 7, + "7,20": 7, + "7,21": 7, + "7,22": 6, + "7,23": 4, + "7,24": 4, + "7,25": 4, + "7,26": 4, + "7,27": 3, + "7,28": 3, + "7,29": 3, + "7,30": 3, + "7,31": 3, + "7,32": 3, + "7,33": 3 }, "SheetStyle": { "FontFamily": 2, @@ -573,9 +655,9 @@ } }, "Spans": [ - "5,2,1,3", - "4,1,1,33", - "2,1,1,34" + "7,2,1,3", + "5,1,1,33", + "3,1,1,34" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -608,8 +690,8 @@ "Fill": "Accent 1 0" }, "IsAutomaticFill": false, - "Location": "3,6", + "Location": "3,21", "Size": "3,18" } ] -}//8rgT8RYXI09/y4vU+KJqjy1KGwv80p9bHxyg83BAMZAtf4aZv0LzjbR3QbCvjUcHDzL6s/doo5lzxdrF+Tbw1QWiO1XBGLk5N3UXah5YUQJaitoV1ei5amheo/UHlvimZtrDChzRZrjchjGU6WmGMLcMrfzW+TVZ6ZkHJAiZZqbKAq7f4GM9zwnkk5eokdi5w4Cdz6u1vVdNqJX4YIZXIk/YzBXL3vUiqBDY8jRwNDmaR7c6JtxbW/PHWOC5KI0hzQ0sdQCWplkyOrEU4DIT4KcUYnQqXey9ipfT5YSIR2ppAaaAe2SDoftxnu0dzGLXfQePGFJhVBgxRQsV8j5Oa2T/yjgIKHMmV65674j9qcGrCJoRIajixRpXWL/Dsq8grtvMca3JRNfLDRXRw5NBwiTlg9MsE5cTQmd7jc18gyy9t/3G3QlJpuA1tNNjpxTdFYUJWNmc+SP11P7f0sjo/FR2ciKfOIAnvXnGjBf8lwJUiZttjVDVBO4TqZMj4SECy+g5GqZTsHRn65gpGg2KHLMMF5NYBWePfbwUVeJdb/nII4GYGKitc8I/O9i5YzNIjIbMfavsYRrUh592q2JLaLi1ycNEjhQAUTDXEoMSWpJcjNRKsToCcNwc4ZVcQnvD+cD4GAamzQgr6hOfs2GpuTGb2nhvjrqk0/K0vQUbTFapXYhpjh42fySRwyB6nA9Av8Gz1Q3j2jwrcwVrlakXHovegE14DQUi1mkd4B+IXo1Tqh0bOp86yZigVSZIwS2+EtFa7S/FPIjf8W2rBespaULk1pkhwshux4p0gLphMTODihFtUgmPkFiwsfpLIzxRzvHZh52hbAr/uS9GLCyO+/5AFVKF/3jNpzhht3hK2whWGv6bCgfhs7ihKYWw/pNgxlYqOD7JgPWgHfzvBgVigg==|920 \ No newline at end of file +}//lrEGThANy6ll3Cw38d9EOyIMFUyNm4oFVKMYq6GKqT9JOU7h5AXgsASU2AOXCV0grqy3wRl7ll/mU4VPOGKM99GE7x7+g76Pxp+wPwani5NgZBqiM+IJG84LLLMtatcYXwd4nSw1PgH450vxnpkyFCL8XZ0CGW69M5Ur1rpK+DRL5UnDvNYw6apHJWDnKhsOj032OanMMRMswfatCuF8OJKEMv3AzArXvZWLaJ1mKddvdJNvSvrbJQLbmIXqkN9pWSFrUQW7AohyiI+l57wajASYndJ/WPBgRObKVIh45EacNQV/IoEMJyF7vEM0hNrP8QBdt1614eYybiiV4FyECMB5VxvaZUzRlRkrklx5PVf/QEtPCafb4CWM+56IeexwesLtrocXWweDSiAzsb8cvbzNdAxUMoez9mN+W/b7mQhHs5EL85QmnESLsXtMgrugUh1aGSZeK4KJqoDJnWmQCQmiOqn3M+FVbJm+GSBxLQsBXBky/rvsfq+5zRa9mhyaRVMVlWi/VngvZYdtdsb3taU7LkDMva8OWN31f7cWWaTbuKJcmY9pYnXUgVjc/2Dv1LSj7A1B7I2Z6T6/C9m3Y5EYYJX5V0AW/SDeVedZmDhKHp/FUx774fh4J2sMyfrYoEq/eFyEa9yDz/ovV/tiRAqtQeTsuq9ugdO/3sRzCyetznBrWoY9JC8Iwf0yyoPIDTEdensIwO+No57dCPYwNr0rW4EYf4p5E0whALTuFRW9N++5urz03baQ4ciaSvQaRfriLROaCTsjwxSqLQrbrek1HaNsi2xW+EWi5KogelwHURKoIb8wNPJuy+bKYFTjQiBdNBtab6nBHrOBwMwjoqV/sSXC1YItn9xcvVpAwOkFXzWuf9fDJCL7xG/AFlXqJHPkyvh6xEwi08h0a+v65w==|920 \ No newline at end of file diff --git a/Pages/收益/收益中心-变动记录.rd b/Pages/收益/收益中心-变动记录.rd index 1d62c24e..68d6d771 100644 --- a/Pages/收益/收益中心-变动记录.rd +++ b/Pages/收益/收益中心-变动记录.rd @@ -1,8 +1,8 @@ { "PageType": 0, "ColumnCount": 36, - "RowCount": 6, + "RowCount": 8, "Formulas": { - "0,34": "IF(C6,H6,G6)" + "1,34": "IF(C8,H8,G8)" } } \ No newline at end of file diff --git a/Pages/收益/收益中心-收益明细.json b/Pages/收益/收益中心-收益明细.json index fc08b938..b1634186 100644 --- a/Pages/收益/收益中心-收益明细.json +++ b/Pages/收益/收益中心-收益明细.json @@ -3,32 +3,42 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 15.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 30.0 } }, "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 293.0, "Mode": 1 } }, - "3": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } }, - "4": { + "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 34.0, "Mode": 1 } }, - "5": { + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "7": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -36,10 +46,10 @@ } }, "InLogicalVisibleIndexes": [ - 5 + 7 ], - "Count": 6, - "DefaultSize": 30.0 + "Count": 8, + "DefaultSize": 15.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -215,13 +225,13 @@ "DefaultSize": 32.0 }, "Values": { - "0,1": "收益明细" + "1,1": "收益明细" }, "Formulas": { - "0,34": "IF(C6,H6,G6)" + "1,34": "IF(C8,H8,G8)" }, "AttachInfos": { - "0,34": { + "1,34": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -231,11 +241,11 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='收益中心-收益明细'!C6" + "SerializeProperty": "='收益中心-收益明细'!C8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('收益中心-收益明细'!C6)" + "SerializeProperty": "=NOT('收益中心-收益明细'!C8)" } } ] @@ -247,7 +257,7 @@ "UseCellForeColor": true } }, - "2,1": { + "3,1": { "CellType": { "$type": "ElementUI.TableCellType, ElementUI", "ElTableName": "EL表格1", @@ -255,6 +265,24 @@ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", "TableName": "View_任务工时统计", "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "请款单ID", + "GUID": "79c617c1-9810-4bd7-9a5a-74ce496f383b", + "RelationBinding": { + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "状态", + "NextRelationBinding": { + "RelatedTable": "请款单状态", + "RelatedColumn": "状态码", + "DisplayColumn": "状态" + } + } + }, + "ColumnName": "状态" + }, { "BindingInfo": { "TableName": "View_任务工时统计", @@ -295,7 +323,7 @@ "ColumnName": "工时核定方式", "GUID": "f9ab5d24-cc3f-44ef-aa54-47e9eeccc5f7" }, - "ColumnName": "工时核定方式" + "ColumnName": "核定方式" }, { "BindingInfo": { @@ -344,6 +372,14 @@ "GUID": "1d8f546a-55c6-467a-b409-e4b2158aa7ac" }, "ColumnName": "计算收益" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "ID", + "GUID": "40c01c0e-e555-45af-bf1b-afde2b6a1e30" + }, + "ColumnName": "ID" } ], "SqlCondition": { @@ -371,6 +407,16 @@ }, "autoGenerateColumnsByDataSource": false, "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "状态", + "label": "状态", + "width": 80, + "align": "center", + "headerAlign": "center", + "resizable": false, + "key": "be272a80-5d76-4e7d-93e2-c09672b2b763" + }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "日期", @@ -398,8 +444,8 @@ }, { "$type": "ElementUI.ColumnSetting, ElementUI", - "dataColumnName": "工时核定方式", - "label": "工时核定方式", + "dataColumnName": "核定方式", + "label": "核定方式", "align": "center", "headerAlign": "center", "key": "52de4693-9aff-47f4-8b77-df87dd5adc10" @@ -454,6 +500,16 @@ "align": "center", "headerAlign": "center", "key": "5624fac4-3744-4207-a9f3-a91accc3b041" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "ID", + "label": "ID", + "width": 60, + "align": "center", + "headerAlign": "center", + "resizable": false, + "key": "cfe56898-f6fb-4c03-83a2-860d06be6541" } ], "showActionButtons": true, @@ -462,10 +518,38 @@ "$type": "ElementUI.ActionButton, ElementUI", "type": "button", "Name": "查看", - "shape": "default" + "shape": "default", + "Commands": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "ID", + "GUID": "559f58f9-d6bb-42c4-a905-8210e1503ab3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='收益中心-收益明细'!行数据.ID" + } + } + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "修改报工", + "LoadBindingDataOption": 1 + } + ], + "ParamProperties": { + "dataRow": "行数据" + } + } } ], - "operationColumnWidth": 130, + "operationColumnWidth": 100, "sumText": "合计", "size": "small", "showIndexColumn": true, @@ -473,7 +557,7 @@ "stripe": false } }, - "4,1": { + "5,1": { "CellType": { "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", "AttachElementTable": true, @@ -522,7 +606,7 @@ "hideOnSinglePage": true } }, - "5,2": { + "7,2": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "收起", @@ -534,11 +618,11 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='收益中心-收益明细'!2:5" + "SerializeProperty": "='收益中心-收益明细'!3:6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('收益中心-收益明细'!C6)" + "SerializeProperty": "=NOT('收益中心-收益明细'!C8)" } } ] @@ -546,7 +630,7 @@ ] } }, - "5,6": { + "7,6": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "ToolTip": "收起", @@ -555,7 +639,7 @@ "UseCellForeColor": true } }, - "5,7": { + "7,7": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "ToolTip": "收起", @@ -625,74 +709,107 @@ ] }, "CellStyles": { - "0,1": 0, - "0,34": 1, - "2,1": 2, + "1,1": 0, + "1,34": 1, "3,1": 2, - "3,2": 2, - "3,3": 2, - "3,4": 2, - "3,5": 2, - "3,6": 2, - "3,7": 2, - "3,8": 2, - "3,9": 2, - "3,10": 2, - "3,11": 2, - "3,12": 2, - "3,13": 2, - "3,14": 2, - "3,15": 2, - "3,16": 2, - "3,17": 2, - "3,18": 2, - "3,19": 2, - "3,20": 2, - "3,21": 2, - "3,22": 2, - "3,23": 2, - "3,24": 2, - "3,25": 2, - "3,26": 2, - "3,27": 2, - "3,28": 2, - "3,29": 2, - "3,30": 2, - "3,31": 2, - "3,32": 2, - "3,33": 3, "4,1": 2, - "5,1": 4, - "5,2": 4, - "5,5": 5, - "5,6": 6, - "5,7": 6, - "5,8": 5, - "5,9": 5, - "5,10": 5, - "5,11": 6, - "5,12": 4, - "5,13": 4, - "5,14": 4, - "5,15": 4, - "5,16": 7, - "5,17": 7, - "5,18": 7, - "5,19": 7, - "5,20": 7, - "5,21": 7, - "5,22": 6, - "5,23": 4, - "5,24": 4, - "5,25": 4, - "5,26": 4, - "5,27": 3, - "5,28": 3, - "5,29": 3, - "5,30": 3, - "5,31": 3, - "5,32": 3, - "5,33": 3 + "4,2": 2, + "4,3": 2, + "4,4": 2, + "4,5": 2, + "4,6": 2, + "4,7": 2, + "4,8": 2, + "4,9": 2, + "4,10": 2, + "4,11": 2, + "4,12": 2, + "4,13": 2, + "4,14": 2, + "4,15": 2, + "4,16": 2, + "4,17": 2, + "4,18": 2, + "4,19": 2, + "4,20": 2, + "4,21": 2, + "4,22": 2, + "4,23": 2, + "4,24": 2, + "4,25": 2, + "4,26": 2, + "4,27": 2, + "4,28": 2, + "4,29": 2, + "4,30": 2, + "4,31": 2, + "4,32": 2, + "4,33": 3, + "5,1": 2, + "6,1": 2, + "6,2": 2, + "6,3": 2, + "6,4": 2, + "6,5": 2, + "6,6": 2, + "6,7": 2, + "6,8": 2, + "6,9": 2, + "6,10": 2, + "6,11": 2, + "6,12": 2, + "6,13": 2, + "6,14": 2, + "6,15": 2, + "6,16": 2, + "6,17": 2, + "6,18": 2, + "6,19": 2, + "6,20": 2, + "6,21": 2, + "6,22": 2, + "6,23": 2, + "6,24": 2, + "6,25": 2, + "6,26": 2, + "6,27": 2, + "6,28": 2, + "6,29": 2, + "6,30": 2, + "6,31": 2, + "6,32": 2, + "6,33": 2, + "7,1": 4, + "7,2": 4, + "7,5": 5, + "7,6": 6, + "7,7": 6, + "7,8": 5, + "7,9": 5, + "7,10": 5, + "7,11": 6, + "7,12": 4, + "7,13": 4, + "7,14": 4, + "7,15": 4, + "7,16": 7, + "7,17": 7, + "7,18": 7, + "7,19": 7, + "7,20": 7, + "7,21": 7, + "7,22": 6, + "7,23": 4, + "7,24": 4, + "7,25": 4, + "7,26": 4, + "7,27": 3, + "7,28": 3, + "7,29": 3, + "7,30": 3, + "7,31": 3, + "7,32": 3, + "7,33": 3 }, "SheetStyle": { "FontFamily": 2, @@ -700,9 +817,9 @@ } }, "Spans": [ - "5,2,1,3", - "4,1,1,33", - "2,1,1,34" + "7,2,1,3", + "5,1,1,33", + "3,1,1,34" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -735,8 +852,8 @@ "Fill": "Accent 1 0" }, "IsAutomaticFill": false, - "Location": "3,6", + "Location": "3,21", "Size": "3,18" } ] -}//19pNThSpOBSQhd2FjU+E/JWYdDNGWDt+Hp/cSNw9Hac2IaxAf/8spVu8JuEcP57zpGULeRECrDLGYQyVSc68d3qorX7c1/kWVJF8ZkH87JhpunJASCiZ+5uNsfvbmoWD6YgUI7YUYPqppJpiKbNdtSO0GD1/PN0zao0DSL+d85vKcOy5Aw5HOm6rF6Mwy/60k82BZJrT6DmOl/FgzveUtiPKbiOBv6bB2qk25LPcJbWVPtsd7GiILCtyn0++9J79W3ELwcghRU9nTI4RrsNcSIU0g8n9wVlVQ93i/J3COJTHPnkDh0Qd4DX1+NPyacdN8CaJwDiG7ovNyGoL041IKNEp/8t7fhu06/KazTxplIdG/lDVMjtVOYd2y6ObwrXEm0p0xRVfkvtJ4gi9XR1uhynKCuw70D6764iV/Rhk7Bww/oju/9PIbpzKhDv/gdrvDJy7c92SThUkjsk5OxWlhJKL/utdiQR8f7p/CTLakm2iLo2EvSau5hG0DQa6qOzkVvP2d5i0hwwy5iIBg8+G1GcxFOXER5oN+E9QCMfDRC8Ih/mJ+JZufXvU9eiKqmK7/d9idSmK1uM5wsw9CedXgJg3uScZ7mK6Cra1D9RwCdY57JqaNqp4ekG/R9cLJ++P+ajckIUPn2jncvnIRGuek5ZAwn4bsXKCnssa0iEKdbRyaWEkpRG/oBS1Xt7XUEwWb0lWl2BA36ud/pDd4K842LDe7dtN/pXBV0rKecZbvlPOkpXJCP5nLdB8tvbTqDaMwlkFzPPhkaLAEoiDRC5AkkgF4XTP5yZZ2uUcppfCDYXmZ9mPD2F88vKzurQAzMRTliEyVuy98X8KzV9zQ75rWcW188bjT+MOKBLtD+ChbI827KnqdFkydYGKbexMBDKhyUwem4gbUNsUmt+K5R6/Ww==|920 \ No newline at end of file +}//Mv//zu4400oMccVB88FzHpsDdiGPPADtJW8EDemF65B/seBHVGWGQ9cwNpfhDQn1hNa0g8R0pe9t5KCWhUkY7pN0AfCy5FLAU4Bp7DSFE2oY/7HOFaZoaxqbm+Dqa4oq5nJYueJdH98cVDdZmBDUmHsbs2QsoS0Y86U9cOjCLJZpRYmF66I9xiiGzfJvL6OVMjSaDrLqpx6oO/2GJlRDHaE9LwaZiQA92ckbxlaa6Ea9lBzPGu4j5UfCj3sZQALyb/fS+V80gm7hUBmfu7b7nH1m4G5NGUP2w7FBMfjmXWRc6LNGImCnQIhC33eEbQ8UR37lutb5ZsgUoXMoSHx1mMJ4MUJANxSQFADw+VKIJiMb03K4il/UIR8W4vnavm6lFCzPGprYmcWqH7bchKfgOLzyJYKkwMDRSClPFYySAJKSTMp/5VeEr6Z9ZcglslUqqwYquNFnFRROXuLammGXhgpZrucxL6RtPBMpGWpeUW/k44Y5bwWLWAGFQBn4qz4p6z5R1Xp+PkjFkSyNi7cFsh864xErtDJiz+rgoqsQ0xeUJdLsgB3zpcC1AQTiOrSid8C3xelIcTOX5snNDHDtZ8bigDdknNYzSHVWiy6qtytpNsg6v4lfM/xEixoD4BwP5765F2NFcw6gHCcm1IqoeUjkS76oQdVadCTqTFpymbcqpxgwPhCOkdXxBdv//7oHThL6/43t9gJAyDTgiJ5YZRLvPO58/4UsBuqHzG21NfROes1MGaa/a/JgRUZCrRTD2iGUTuWZbs8q7cAufPUUX/9spUSPoSRr13mro6AmsPbIpd7ruLDqEnkueaDvI2bban8tzfQgWZsLidiU0etdaNHt6JjF6qWN9cztwClrswmuCjq9z85W8S5OYNVNw4YY0AMv9ArImvwnYwUhMuLVkQ==|920 \ No newline at end of file diff --git a/Pages/收益/收益中心-收益明细.rd b/Pages/收益/收益中心-收益明细.rd index 1d62c24e..68d6d771 100644 --- a/Pages/收益/收益中心-收益明细.rd +++ b/Pages/收益/收益中心-收益明细.rd @@ -1,8 +1,8 @@ { "PageType": 0, "ColumnCount": 36, - "RowCount": 6, + "RowCount": 8, "Formulas": { - "0,34": "IF(C6,H6,G6)" + "1,34": "IF(C8,H8,G8)" } } \ No newline at end of file diff --git a/Pages/收益/收益中心-收益请款记录.json b/Pages/收益/收益中心-收益请款记录.json index 143c0c90..bb8d902d 100644 --- a/Pages/收益/收益中心-收益请款记录.json +++ b/Pages/收益/收益中心-收益请款记录.json @@ -3,32 +3,42 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 + "DesignLengthInPixel": 15.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 30.0 } }, "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 293.0, "Mode": 1 } }, - "3": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } }, - "4": { + "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 34.0, "Mode": 1 } }, - "5": { + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "7": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -36,10 +46,10 @@ } }, "InLogicalVisibleIndexes": [ - 5 + 7 ], - "Count": 6, - "DefaultSize": 30.0 + "Count": 8, + "DefaultSize": 15.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -215,13 +225,13 @@ "DefaultSize": 32.0 }, "Values": { - "0,1": "收益请款记录" + "1,1": "收益请款记录" }, "Formulas": { - "0,34": "IF(C6,H6,G6)" + "1,34": "IF(C8,H8,G8)" }, "AttachInfos": { - "0,34": { + "1,34": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -231,11 +241,11 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='收益中心-收益请款记录'!C6" + "SerializeProperty": "='收益中心-收益请款记录'!C8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('收益中心-收益请款记录'!C6)" + "SerializeProperty": "=NOT('收益中心-收益请款记录'!C8)" } } ] @@ -247,7 +257,7 @@ "UseCellForeColor": true } }, - "2,1": { + "3,1": { "CellType": { "$type": "ElementUI.TableCellType, ElementUI", "ElTableName": "EL表格1", @@ -303,6 +313,27 @@ }, "ColumnName": "备注" }, + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "总收益", + "GUID": "d976364d-9062-4003-9a78-b765fc51f59c" + }, + "ColumnName": "申请金额" + }, + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "付款凭证ID", + "GUID": "8bf130e7-18ba-4eeb-9a0a-acb2c160be4c", + "RelationBinding": { + "RelatedTable": "付款凭证表", + "RelatedColumn": "ID", + "DisplayColumn": "付款金额" + } + }, + "ColumnName": "付款金额" + }, { "BindingInfo": { "TableName": "收益请款单表", @@ -356,6 +387,7 @@ "dataColumnName": "请款日期", "label": "请款日期", "formatStr": "yyyy年MM月dd日", + "width": 200, "align": "center", "headerAlign": "center", "key": "0a669200-0ffa-4a26-b0dd-6066c56c244b" @@ -373,7 +405,7 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "开户行", "label": "开户行", - "width": 200, + "width": 150, "align": "left", "headerAlign": "center", "key": "8d8756af-393d-4af8-885c-694ed87cc412" @@ -382,16 +414,37 @@ "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "帐号", "label": "帐号", - "width": 200, "align": "center", "headerAlign": "center", "showOverflowTooltip": true, "key": "60ae746c-5da5-4460-81a2-bc4e4a7c1366" }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "申请金额", + "label": "申请金额", + "formatStr": " ¥#,##0.00_)", + "width": 150, + "align": "center", + "headerAlign": "center", + "key": "56f8465f-0168-4c28-84c8-b85c8c6e022b" + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "付款金额", + "label": "付款金额", + "formatStr": " ¥#,##0.00_)", + "width": 150, + "align": "center", + "headerAlign": "center", + "key": "5a6d3649-1599-4664-ac0c-4674587df276" + }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "备注", "label": "备注", + "width": 200, + "minWidth": 200, "align": "center", "headerAlign": "center", "key": "bcd75bc7-1398-4a5b-9266-3209b72048a4" @@ -402,7 +455,7 @@ "label": "状态", "width": 100, "minWidth": 100, - "align": "left", + "align": "center", "headerAlign": "center", "key": "db6e98b0-40f3-4b26-a84f-e23551ced546" } @@ -413,18 +466,45 @@ "$type": "ElementUI.ActionButton, ElementUI", "type": "button", "Name": "查看", - "shape": "default" + "shape": "default", + "Commands": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "ID", + "GUID": "c09e9a6a-01b8-4055-8d93-bfb819649eae" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='收益中心-收益请款记录'!行数据.ID" + } + } + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "审批结算申请单", + "LoadBindingDataOption": 1 + } + ], + "ParamProperties": { + "dataRow": "行数据" + } + } } ], - "operationColumnWidth": 130, + "operationColumnWidth": 100, "sumText": "合计", "size": "small", - "showIndexColumn": true, "border": false, "stripe": false } }, - "4,1": { + "5,1": { "CellType": { "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI", "AttachElementTable": true, @@ -473,7 +553,7 @@ "hideOnSinglePage": true } }, - "5,2": { + "7,2": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "收起", @@ -485,11 +565,11 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='收益中心-收益请款记录'!2:5" + "SerializeProperty": "='收益中心-收益请款记录'!3:6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('收益中心-收益请款记录'!C6)" + "SerializeProperty": "=NOT('收益中心-收益请款记录'!C8)" } } ] @@ -497,7 +577,7 @@ ] } }, - "5,6": { + "7,6": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "ToolTip": "收起", @@ -506,7 +586,7 @@ "UseCellForeColor": true } }, - "5,7": { + "7,7": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "ToolTip": "收起", @@ -576,74 +656,107 @@ ] }, "CellStyles": { - "0,1": 0, - "0,34": 1, - "2,1": 2, + "1,1": 0, + "1,34": 1, "3,1": 2, - "3,2": 2, - "3,3": 2, - "3,4": 2, - "3,5": 2, - "3,6": 2, - "3,7": 2, - "3,8": 2, - "3,9": 2, - "3,10": 2, - "3,11": 2, - "3,12": 2, - "3,13": 2, - "3,14": 2, - "3,15": 2, - "3,16": 2, - "3,17": 2, - "3,18": 2, - "3,19": 2, - "3,20": 2, - "3,21": 2, - "3,22": 2, - "3,23": 2, - "3,24": 2, - "3,25": 2, - "3,26": 2, - "3,27": 2, - "3,28": 2, - "3,29": 2, - "3,30": 2, - "3,31": 2, - "3,32": 2, - "3,33": 3, "4,1": 2, - "5,1": 4, - "5,2": 4, - "5,5": 5, - "5,6": 6, - "5,7": 6, - "5,8": 5, - "5,9": 5, - "5,10": 5, - "5,11": 6, - "5,12": 4, - "5,13": 4, - "5,14": 4, - "5,15": 4, - "5,16": 7, - "5,17": 7, - "5,18": 7, - "5,19": 7, - "5,20": 7, - "5,21": 7, - "5,22": 6, - "5,23": 4, - "5,24": 4, - "5,25": 4, - "5,26": 4, - "5,27": 3, - "5,28": 3, - "5,29": 3, - "5,30": 3, - "5,31": 3, - "5,32": 3, - "5,33": 3 + "4,2": 2, + "4,3": 2, + "4,4": 2, + "4,5": 2, + "4,6": 2, + "4,7": 2, + "4,8": 2, + "4,9": 2, + "4,10": 2, + "4,11": 2, + "4,12": 2, + "4,13": 2, + "4,14": 2, + "4,15": 2, + "4,16": 2, + "4,17": 2, + "4,18": 2, + "4,19": 2, + "4,20": 2, + "4,21": 2, + "4,22": 2, + "4,23": 2, + "4,24": 2, + "4,25": 2, + "4,26": 2, + "4,27": 2, + "4,28": 2, + "4,29": 2, + "4,30": 2, + "4,31": 2, + "4,32": 2, + "4,33": 3, + "5,1": 2, + "6,1": 2, + "6,2": 2, + "6,3": 2, + "6,4": 2, + "6,5": 2, + "6,6": 2, + "6,7": 2, + "6,8": 2, + "6,9": 2, + "6,10": 2, + "6,11": 2, + "6,12": 2, + "6,13": 2, + "6,14": 2, + "6,15": 2, + "6,16": 2, + "6,17": 2, + "6,18": 2, + "6,19": 2, + "6,20": 2, + "6,21": 2, + "6,22": 2, + "6,23": 2, + "6,24": 2, + "6,25": 2, + "6,26": 2, + "6,27": 2, + "6,28": 2, + "6,29": 2, + "6,30": 2, + "6,31": 2, + "6,32": 2, + "6,33": 2, + "7,1": 4, + "7,2": 4, + "7,5": 5, + "7,6": 6, + "7,7": 6, + "7,8": 5, + "7,9": 5, + "7,10": 5, + "7,11": 6, + "7,12": 4, + "7,13": 4, + "7,14": 4, + "7,15": 4, + "7,16": 7, + "7,17": 7, + "7,18": 7, + "7,19": 7, + "7,20": 7, + "7,21": 7, + "7,22": 6, + "7,23": 4, + "7,24": 4, + "7,25": 4, + "7,26": 4, + "7,27": 3, + "7,28": 3, + "7,29": 3, + "7,30": 3, + "7,31": 3, + "7,32": 3, + "7,33": 3 }, "SheetStyle": { "FontFamily": 2, @@ -651,9 +764,9 @@ } }, "Spans": [ - "5,2,1,3", - "4,1,1,33", - "2,1,1,34" + "7,2,1,3", + "5,1,1,33", + "3,1,1,34" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -686,8 +799,8 @@ "Fill": "Accent 1 0" }, "IsAutomaticFill": false, - "Location": "3,6", + "Location": "3,21", "Size": "3,18" } ] -}//e8FR8WwxUviv0iZHn73L6eU7bztUN6yTs1t9Gdbbv3vZ673lzroGsHt7RYzszfja+95Oyvz238w1v9odcp7m/73iR9P4XMV3qr6toNUASAfjPpMTV7Auwbk9kxv6KgSjszESz8GVXdcWMt132hFxGz66y2NpSs7K2iu+VBVLwKLiAsDKqQlL3zvv14y9fWEmQw0XviYOTjloet8hPuBAhfYWyQ7Tq8cFnzqMfJIiYLU78kc4s1WfgdGTyaq9gYdqg5EV5zahU48Mq4WR88+xYa+rFqMXqvnMpLV43T6q5Rg5dYBtO3WzbDCPl0wFoVbA5YNUgZX+99Gk9eQkNkKZQyHrAI1iz2AIUbas3CiZrIV4tqP+0F4Vb8UqBJ+WYHth2N8HB6xICSPRUUZJBdOG709sHs8+EnX629xJYNOlmv/q/yF+xyZ/zB+9otxaM2KnMrVrDd95HjVRdk2QpW2cmbh1A3IgbuCVAHIh35nm7B2wtNsR1IZqWfp/kjb7o7oYVhDeTKa4pWCeDONpmGg7TGOuerQXqI0aOSqVLBIcBc08oiW1KWEZAvqLwjEZzdt2G9SLlk4RIVzyyFui/OLNps26eqrBHfSPWc4aQXnvYtzHwh1hhv7U8YBJHxcQ9srkYk1ypYRE1+qlpGFbOchDitDCOTpcEAhPtNChFzj90SpAdaXZMvXuL7mgIJNJFomW9L1t+2etsBIFx2qPkgYg/Gqoorc7JfTNnQuGfZVNloNsLQuX6yftlZSQJufa9KiJokBfX7qyTvaKRFabHNe4/3u8fRVDr5iy+UzbR2hdQ0ZkV1if9pQgXrEbYoByUmNCHOxrH50wsfh1VyOv2mkiZEn7NbocyrUVK8lD8tz60meZWxlLOINN2UFlm7DYm5FqFakbt9ogj7VTbCsZbRHsQw==|920 \ No newline at end of file +}//w9TAsZz61FszG0ddp3MUw/d0g5mQmtFTRYyXXCTNL36I1sX19YT/8JO3pp0h1iKSIz6W/6b0txX88fVmBjrEl+bRJL82EAtYKHyxiOhy69IPGO4OMoMWTYBkGGqs1+IxfST6gQf01/qEKcOefP/yuj7tyHt7TYcKqUIDFSwlwQHO3mXitKEwunC4lYcgySWGtZCPc+QRaHJKAN0xwXR6KszYlXEgcoOtEPTLYO3D5UqR1GcFb8GIdWrNmeLQi8iAmlg3TjK0gucBIlzGBJTIJUL1EVViSx40wsCH8TrWXazsR2IPp+/H8Ks74gFlFJ2WU85nQd7C0cnSqCy1gER3BYyTKp+d5kSrssyOJZv7NpfKvaexIPbAYeTpqO1MakJlkZAfJySL2A/pcSc7l7T7iMFMc9aO/QIGRjxY6guzzbyYr4e+9f09Ksmsn4hzEPwqKU1s2PCMQWyh1c5M1J5XGtliX8VcZV0JALZjB0sSBUWXLL/EDJe4WdCqMAPcl9LxxXP2rcaB5O7SFAseJqP5MWQ4VYq6vDG5FCwEGWBsusgBLkQl3P3Z2tvMii0ZhWQkgzrpYBDRQlyCL/Tqfsp0n6wgU5lte8etdeWbQkbQxcST9SS6kVCASCq9Y1yQEaWVYO1ilwuX85Rf838lqO9s4gPF6ErpC7Y+64IpB4e1mUdS9RK1uTCcRLDvlTxXp+ICCzou5qY5Z6BNJG80ts/nHDgIiQS/s5nPPVQkDEaIX2FgfOf/kAxzcsNiBhYCpOXkQFdhFZS3gImC1dn06QXaerr32Euy+PKyu2zKB8TuMyOccDvShYl3twafRxbYxToyNeMO5ouXdZIhIOQvmPRY/FBhVXTPSt0Fg9iABLw6AZk/0V+81qd3oeEnT+NoSlJewIa+LKMNOLdOTUoE3VrTQA==|920 \ No newline at end of file diff --git a/Pages/收益/收益中心-收益请款记录.rd b/Pages/收益/收益中心-收益请款记录.rd index 1d62c24e..68d6d771 100644 --- a/Pages/收益/收益中心-收益请款记录.rd +++ b/Pages/收益/收益中心-收益请款记录.rd @@ -1,8 +1,8 @@ { "PageType": 0, "ColumnCount": 36, - "RowCount": 6, + "RowCount": 8, "Formulas": { - "0,34": "IF(C6,H6,G6)" + "1,34": "IF(C8,H8,G8)" } } \ No newline at end of file diff --git a/Pages/收益/收益中心.json b/Pages/收益/收益中心.json index c95e3004..2b6c518a 100644 --- a/Pages/收益/收益中心.json +++ b/Pages/收益/收益中心.json @@ -23,6 +23,11 @@ "Mode": 1 } }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 6.0 + } + }, "7": { "GridRowColumnDefinition": { "DesignLengthInPixel": 200.0, @@ -31,7 +36,7 @@ }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 6.0 } }, "9": { @@ -285,12 +290,16 @@ }, { "FontFamily": 0 + }, + { + "Background": 2 } ], "Types": { "Strs": [ "Body", - "[AUTO]General" + "[AUTO]General", + "Background 2 0" ] }, "CellStyles": { @@ -375,6 +384,10 @@ "9,38": 2, "9,39": 2 }, + "RowStyles": { + "6": 3, + "8": 3 + }, "SheetStyle": { "FontFamily": 0 } @@ -410,4 +423,4 @@ "PaperSize": {}, "Margin": {} } -}//exDp1UABD4Fgg//rTlvF4Zq0Qn7NYgI8EU5zKxXlXIXikc3rlXlDSpAVAaDhX2/rnZC8Z8wNVIV27bHQkNiubF0BYlTaCi2j2QIguFTdcqXJ7qMmJOphyoIae3M+4ftsh8XgJgocDbBYeJ0IZ5WCbT2mjnWDeBoiCdO1AG+w540Arm6JNMhbg4MWrulrrpht4zQnP4NHVXLx10o8mcrqRxtSObU/ipdeYbZq7/AxVzXHVcvVEjUWuHdiTQ2rHbuxrzq6swPDogPr6d6gXFCYaMEFBPHuBYfuFJc5iU4D8GqL2kI0ZUd+A6ieSIkJdG3mMmf8bZGyxtx8ixWCZ0almCVTxm2+AI1hqYwObUg1PevEY/T/E1huZ3/iUZaA3eK8gtPREF9usIAUzAGm8HHL/1VuyJfdV/HJighZf6FdrH0GgETkAB0MXgcmB8ACmAmhg12QlBcak8uINSjCASeudvaazj6aWgwI7rA6BKeJsQimV58wbDSX7IiFo5CW/4/RuJ+aG16Ottq3xOpIq7QZU1913DMZ0Bv4fZF2L0p9Fr8DC70wrfgdXG00SzgECP7FG3pvH7EHzojiISnNgwLChlVVsOmzZQoDpGe/2uHEACn/WdzG7ya1ICASuGHWe4QhncrJ4m3C4RjZFWEekcndNtfuvU4Z3qmtJ6rp2ieWdrLRGzcVC7hAwnVeK+riJ6p2mVm4iZQINph2OWszJnjjcUmv7+sr0xqVxXsJb9E3jFLqcFxodGG2LN9zRw8YfBP4ExIDfbP48sEqPIinED/65Yt2U2KYoCn3d1V2jyqwIiDqfYvRvTK8i+gnU6AoI0TSgxB8xZobNuBnsLbsQfTdU6exkUri6JN1ABdB6dL5C8Fb/DS1HPJoyzc2HbQR2WeGEO/LiD5yrnmOVyBL2d0qjA==|920 \ No newline at end of file +}//uxU2EC24r/GcbSaB+CaIw6HlKhSWRWrmt6SzLVjkM3vTAfRotb5RWl/DoJLfsMHsVFk9wmCAewBf9YjF+ATBeOCaOKhVYnc/EtiSQhJ3e7eMDnqmcnec0pTfnLHlHCcY8HlxswpCweDzEJWDakd9zeg3kGbjyzGk5STGKffJn80byKCqYz9IM8w8Ionjah2M7woIx7MTEtPZw9qVtRnuOrxQnTxTCVnVoxQW1G1a5VYaraPVoSCLgZOVRHo/eX7/r8uf7uXe2Z7wCx61NvT7EeV3VIJatLJ8SfKTTFYukYz28TIZjIIpeE86hdCm4hqqOqJvOhcvPNCIu2tT+JWsBhYrnsMUFCO5yh1VMKvs9iMpAIFIce31yOdG4KAC+oodKPfgOeKze1u/X1E74Jjz8Jwd/dYctQd/9SO0ks1RTMfBKgUIv6+HLbF2oVvq55zgck17pMUct0euwbHdAYF68c8diz9H9rFQlroGkRa430sWsqML1JdLR9HeTkTyy3dWtX0LDy0n7zwVGycyYY3MReIHMuwH1r79RcBc3cEkhP/R6ILEsYfrByBpKjw6747iusGlaFb97AFcSASo0XPNT5CycvfEJkftfwPRhLOmJYUdjDZB+kSfD/gHnM9WEGk1PhocDYEih+Oc3ifBqMys5ExPAE20FKRwePNdgxMWvrboSJcLYpBAwh4CPdZLQrFQfTmSY0C3wwnMhLSIE8uMfKZs2I14FRIsL652AU03w60cG7WVyDZp3vHysTwwfUwhvejUq1Ok82HRrjerGOruYMjAKPvgOkak07uQtC1A3q/OTldwWU7wJ+c9F63iXuj8VmFYB0g1Uhp05OaRscM3krVMflKqZKi+vGFF7PIVCfHvKYrZsZ8AAh45eJqKigJj7Y+67OtTO5Dqldi3Ge+P2Q==|920 \ No newline at end of file diff --git a/Process/结算申请.bpmn b/Process/结算申请.bpmn index ea4c3885..9c8e5bf9 100644 --- a/Process/结算申请.bpmn +++ b/Process/结算申请.bpmn @@ -4,7 +4,7 @@ - + @@ -22,7 +22,7 @@ - + _9fac5c71-636e-41e6-915a-49a1e7b67072 _8c854f9d-40d8-4aed-acb1-6778e09b2e08 @@ -46,7 +46,7 @@ - + _8c854f9d-40d8-4aed-acb1-6778e09b2e08 Flow_0c6ycpo diff --git a/ServerCommands/收益/绑定工时与请款单.json b/ServerCommands/收益/绑定工时与请款单.json index 6f9f98df..85633f0d 100644 --- a/ServerCommands/收益/绑定工时与请款单.json +++ b/ServerCommands/收益/绑定工时与请款单.json @@ -26,17 +26,43 @@ "DataValidationInfo": { "IgnoreBlank": false } - }, - { - "Name": "工时ID数组", - "DataValidationInfo": { - "IgnoreBlank": false - } } ] } ], "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "单据", + "TableValue": { + "TableName": "收益请款单表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "工时ID数组", + "GUID": "244ec80e-5831-44d1-8366-df1406ead9ff" + }, + "ColumnName": "工时ID数组" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "ID", + "GUID": "aed2d551-3fe7-4d07-88a6-4d935d9792f7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单ID" + } + }, + "TopCount": "1" + }, + "ID": "ec9c21ad2fe34592ae97cbf4d94e7e58" + }, { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "任务工时表", @@ -52,7 +78,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时ID数组" + "SerializeProperty": "=单据.工时ID数组" } }, "UpdateBindingValues": [ @@ -60,7 +86,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "请款单ID", - "GUID": "40714ae4-382b-40df-ba1e-9b2bde3ee0e8" + "GUID": "81fdadc9-bb3e-4d66-abaa-d85414a4f5d7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", diff --git a/ServerCommands/收益/绑定结算请款单凭证ID.json b/ServerCommands/收益/绑定结算请款单凭证ID.json new file mode 100644 index 00000000..7528819f --- /dev/null +++ b/ServerCommands/收益/绑定结算请款单凭证ID.json @@ -0,0 +1,203 @@ +{ + "Name": "绑定结算请款单凭证ID", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "请款单ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "凭证ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "请款单", + "TableValue": { + "TableName": "收益请款单表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "请款人", + "GUID": "c963a44b-4716-4526-86a6-664edcaf1d89" + }, + "ColumnName": "请款人" + }, + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "户名", + "GUID": "991ef5e9-65de-4f2d-9ed6-9f36b3114c78" + }, + "ColumnName": "户名" + }, + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "帐号", + "GUID": "55ee3d92-fe3e-421b-ae51-d7d9293ca85f" + }, + "ColumnName": "帐号" + }, + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "开户行", + "GUID": "7550ff72-06c5-481f-b9fb-5964e9c368e1" + }, + "ColumnName": "开户行" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "ID", + "GUID": "0833eff5-5814-40fe-8cff-b73eabd4b1c5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "7838c90dad534d6cb7ae55f0aa63369b" + }, + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "收益请款单表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "ID", + "GUID": "28f0ca89-a70a-40b9-96b6-f0b014b20a5f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "付款凭证ID", + "GUID": "02f3b375-c90d-472d-a961-65e6219c0329" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=凭证ID" + } + } + ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "付款凭证表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "ID", + "GUID": "20193d9f-de70-4675-8748-d8c2ab9c5b98" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=凭证ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "收款人", + "GUID": "5b52c634-0ea3-49aa-9b30-e9f54f35173a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单.请款人" + } + }, + { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "户名", + "GUID": "9b0f90e5-73e6-4197-9809-322082127662" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单.户名" + } + }, + { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "卡号", + "GUID": "e0aa8a6d-68b5-4a20-9f43-f36f4b65ecf8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单.帐号" + } + }, + { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "开户行", + "GUID": "d8ab546d-1aba-478b-b830-f030b09c5bad" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单.开户行" + } + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "绑定成功" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/收益/记录收益变动.json b/ServerCommands/收益/记录收益变动.json new file mode 100644 index 00000000..63bbafb3 --- /dev/null +++ b/ServerCommands/收益/记录收益变动.json @@ -0,0 +1,215 @@ +{ + "Name": "记录收益变动", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "请款单ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "请款单", + "TableValue": { + "TableName": "收益请款单表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "付款凭证ID", + "GUID": "97c9ef6c-ef91-4922-9d3f-8be0f5113b88" + }, + "ColumnName": "付款凭证ID" + }, + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "付款凭证ID", + "GUID": "44892132-df99-4467-aed8-936bf84a67f6", + "RelationBinding": { + "RelatedTable": "付款凭证表", + "RelatedColumn": "ID", + "DisplayColumn": "付款金额" + } + }, + "ColumnName": "付款金额" + }, + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "付款凭证ID", + "GUID": "fc7a9f5e-f5c9-468a-9cca-4fd51092a65c", + "RelationBinding": { + "RelatedTable": "付款凭证表", + "RelatedColumn": "ID", + "DisplayColumn": "备注" + } + }, + "ColumnName": "备注" + }, + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "请款日期", + "GUID": "a512c59c-4bd5-4553-9740-c859a20ae38c" + }, + "ColumnName": "请款日期" + }, + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "付款凭证ID", + "GUID": "35fd0f79-a95d-4920-ba1e-6ec049a2672f", + "RelationBinding": { + "RelatedTable": "付款凭证表", + "RelatedColumn": "ID", + "DisplayColumn": "经手人" + } + }, + "ColumnName": "经手人" + }, + { + "BindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "付款凭证ID", + "GUID": "ec24ebd3-e0e7-4d84-8116-86e5fa9dddaf", + "RelationBinding": { + "RelatedTable": "付款凭证表", + "RelatedColumn": "ID", + "DisplayColumn": "收款人" + } + }, + "ColumnName": "收款人" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "收益请款单表", + "ColumnName": "ID", + "GUID": "148cb134-07a7-4aa6-adaf-ef6455b003ab" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "6c29c26c85e4460199f8d567f529d043" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "收益变动记录表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "收益变动记录表", + "ColumnName": "日期", + "GUID": "f7968c03-b160-4b0d-b3d4-f18d24d8607f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单.请款日期" + } + }, + { + "BindingInfo": { + "TableName": "收益变动记录表", + "ColumnName": "成员", + "GUID": "f0630db0-89c5-4e28-8604-d08d2d5ab839" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单.收款人" + } + }, + { + "BindingInfo": { + "TableName": "收益变动记录表", + "ColumnName": "操作人", + "GUID": "e9d11215-f07e-460f-b974-7a85d4f6c31b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单.经手人" + } + }, + { + "BindingInfo": { + "TableName": "收益变动记录表", + "ColumnName": "来源", + "GUID": "e261f745-d04f-4049-bbbd-e36611add773" + }, + "Value": "收益结算申请" + }, + { + "BindingInfo": { + "TableName": "收益变动记录表", + "ColumnName": "来源ID", + "GUID": "78e092b2-67bc-4018-b7be-d34a8ee3bf12" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单ID" + } + }, + { + "BindingInfo": { + "TableName": "收益变动记录表", + "ColumnName": "金额", + "GUID": "d82a00f6-920f-42f9-b8e9-92ae696cafe9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单.付款金额" + } + }, + { + "BindingInfo": { + "TableName": "收益变动记录表", + "ColumnName": "备注", + "GUID": "9a003cb7-67a0-45da-a3bc-2f73ceefcd01" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单.备注" + } + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "绑定成功" + } + ] +} \ No newline at end of file diff --git a/Tables/收益/收益变动记录表.json b/Tables/收益/收益变动记录表.json index df6e3aa5..dd9d0774 100644 --- a/Tables/收益/收益变动记录表.json +++ b/Tables/收益/收益变动记录表.json @@ -93,5 +93,14 @@ "PrimaryKey": [ "ID" ], + "Relations": [ + { + "PrimaryTable": "收益请款单表", + "PrimaryColumn": "ID", + "ForeignTable": "收益变动记录表", + "ForeignColumn": "来源ID", + "IsDetailTableRelation": true + } + ], "Indexes": [] } \ No newline at end of file diff --git a/Tables/财务/付款凭证表.json b/Tables/财务/付款凭证表.json index ab4b474f..b3d72be5 100644 --- a/Tables/财务/付款凭证表.json +++ b/Tables/财务/付款凭证表.json @@ -55,6 +55,30 @@ "Name": "备注", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "Name": "收款人", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "Name": "户名", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "Name": "卡号", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "Name": "开户行", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", diff --git a/UserControlPages/收益数据横幅.json b/UserControlPages/收益数据横幅.json index 91736cc3..b01eaae4 100644 --- a/UserControlPages/收益数据横幅.json +++ b/UserControlPages/收益数据横幅.json @@ -256,130 +256,6 @@ "TemplateCellSource": "总金额" }, "4,2": { - "CellType": { - "$type": "Forguncy.TextCellType, ServerDesignerCommon", - "SavedValidators": [ - { - "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" - } - ], - "TemplateKey": "_RS_NewLittleRoundCorner", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=收益数据横幅!C5" - } - ] - }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "查询数据", - "TableValue": { - "TableName": "成员收益分类汇总视图", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "总金额", - "GUID": "76a03426-dc20-468b-b119-1da4144e620b" - }, - "ColumnName": "总金额" - }, - { - "BindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "待结算", - "GUID": "5ebe643f-b33f-47f3-87b0-6e4f8cdca203" - }, - "ColumnName": "待结算" - }, - { - "BindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "办理中", - "GUID": "8c633d3a-453a-42b2-9a64-65503bea7ee7" - }, - "ColumnName": "办理中" - }, - { - "BindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "已结算", - "GUID": "feafc736-503c-419a-b18f-f5e4d7354b09" - }, - "ColumnName": "已结算" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "成员", - "GUID": "5ec74a63-add5-4f1c-822d-7174f9a99ddc" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!C5" - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "921c861a8e754899a130c8511d747543" - }, - { - "$type": "Forguncy.Model.SetUserControlPagePropertyValueCommand, ServerDesignerCommon", - "UserControlProperties": [ - { - "PropertyName": "总金额", - "PropertyValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!查询数据.总金额" - } - }, - { - "PropertyName": "待结算", - "PropertyValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!查询数据.待结算" - } - }, - { - "PropertyName": "办理中", - "PropertyValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!查询数据.办理中" - } - }, - { - "PropertyName": "已结算", - "PropertyValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!查询数据.已结算" - } - } - ] - } - ], - "ID": "bdd73b31-5ce1-452a-9ed7-c09bf4dcb325" - } - ] - } - ] - }, "TemplateCellSource": "Fgc-UC-TwoWayBinding-Value-Column" } }, @@ -426,9 +302,6 @@ "TextIndent": 10, "HorizontalAlignment": 8 }, - { - "Formatter": 9 - }, { "FontFamily": 0, "FontSize": 13.333333333333332, @@ -446,8 +319,7 @@ "Accent 5 0", "¥#,##0_);[Red](¥#,##0)", "black", - "Right", - "@" + "Right" ] }, "CellStyles": { @@ -535,8 +407,7 @@ "3,15": 3, "3,28": 1, "3,29": 0, - "4,2": 6, - "4,8": 7, + "4,8": 6, "4,15": 3, "4,28": 4 }, @@ -585,146 +456,147 @@ ], "CommandDefinitions": [], "MethodDefinitions": [], - "PageLoadedCommandList": [], - "PropertyChangedHandlers": { - "Commands": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=属性名" - } - ] - }, - "value": "用户名" - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=新值" - } - ] - }, - "value": "%Null%", - "compareType": 1 + "SerializeProperty": "=收益数据横幅!C5" } ] }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "查询数据", - "TableValue": { - "TableName": "成员收益分类汇总视图", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "总金额", - "GUID": "76a03426-dc20-468b-b119-1da4144e620b" - }, - "ColumnName": "总金额" - }, - { - "BindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "待结算", - "GUID": "5ebe643f-b33f-47f3-87b0-6e4f8cdca203" - }, - "ColumnName": "待结算" - }, - { - "BindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "办理中", - "GUID": "8c633d3a-453a-42b2-9a64-65503bea7ee7" - }, - "ColumnName": "办理中" - }, - { - "BindingInfo": { - "TableName": "成员收益分类汇总视图", - "ColumnName": "已结算", - "GUID": "feafc736-503c-419a-b18f-f5e4d7354b09" - }, - "ColumnName": "已结算" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "查询数据", + "TableValue": { + "TableName": "成员收益分类汇总视图", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { "TableName": "成员收益分类汇总视图", - "ColumnName": "成员", - "GUID": "5ec74a63-add5-4f1c-822d-7174f9a99ddc" + "ColumnName": "总金额", + "GUID": "76a03426-dc20-468b-b119-1da4144e620b" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!新值" - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "89acde805fc8402093e39e42eda70530" - }, - { - "$type": "Forguncy.Model.SetUserControlPagePropertyValueCommand, ServerDesignerCommon", - "UserControlProperties": [ - { - "PropertyName": "总金额", - "PropertyValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!查询数据.总金额" - } + "ColumnName": "总金额" }, { - "PropertyName": "待结算", - "PropertyValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!查询数据.待结算" - } + "BindingInfo": { + "TableName": "成员收益分类汇总视图", + "ColumnName": "待结算", + "GUID": "5ebe643f-b33f-47f3-87b0-6e4f8cdca203" + }, + "ColumnName": "待结算" }, { - "PropertyName": "办理中", - "PropertyValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!查询数据.办理中" - } + "BindingInfo": { + "TableName": "成员收益分类汇总视图", + "ColumnName": "办理中", + "GUID": "8c633d3a-453a-42b2-9a64-65503bea7ee7" + }, + "ColumnName": "办理中" }, { - "PropertyName": "已结算", - "PropertyValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!查询数据.已结算" - } + "BindingInfo": { + "TableName": "成员收益分类汇总视图", + "ColumnName": "已结算", + "GUID": "feafc736-503c-419a-b18f-f5e4d7354b09" + }, + "ColumnName": "已结算" } - ] - } - ], - "ID": "bc7dfb07-0f71-4d0f-b896-1e4d58aa1416" - } - ] - } - ], - "ParamProperties": { - "propertyName": "属性名", - "oldValue": "原值", - "newValue": "新值" + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "成员收益分类汇总视图", + "ColumnName": "成员", + "GUID": "5ec74a63-add5-4f1c-822d-7174f9a99ddc" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=收益数据横幅!C5" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "a87f85d936ab4423956791f8d16b6dca" + }, + { + "$type": "Forguncy.Model.SetUserControlPagePropertyValueCommand, ServerDesignerCommon", + "UserControlProperties": [ + { + "PropertyName": "总金额", + "PropertyValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=收益数据横幅!查询数据.总金额" + } + }, + { + "PropertyName": "待结算", + "PropertyValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=收益数据横幅!查询数据.待结算" + } + }, + { + "PropertyName": "办理中", + "PropertyValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=收益数据横幅!查询数据.办理中" + } + }, + { + "PropertyName": "已结算", + "PropertyValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=收益数据横幅!查询数据.已结算" + } + } + ] + } + ], + "ID": "a3c8eded-01d4-4d95-ba22-7c7bd9226818" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetUserControlPagePropertyValueCommand, ServerDesignerCommon", + "UserControlProperties": [ + { + "PropertyName": "总金额", + "PropertyValue": "0" + }, + { + "PropertyName": "待结算", + "PropertyValue": "0" + }, + { + "PropertyName": "办理中", + "PropertyValue": "0" + }, + { + "PropertyName": "已结算", + "PropertyValue": "0" + } + ] + } + ], + "ID": "98e56fe5-9dda-41eb-8449-4db194cfbb5e" + } + ] } - } + ] }, "PrintInfo": { "PaperSize": {}, @@ -748,4 +620,4 @@ "Size": "908,112" } ] -}//17WAMcGQ3rdBkmcBnZ4sEAGpHmp8HbqPFCUa11wsnXSrkPoidU3sHjGMH2Rw9mOW/l+GOsMHHfWQ/zMmgTNxuoPPHkrp5vgwWutkbosrKX8bfiJcCx9B0cR/qgPWq5Hq+R8TwdHg4Qf0YzVQk7riIigiZuhf/Ka3uFa7wmaCetwM1rXZNENkCP02uplT36b42PfMWhUpfb2fW/mt97VRVAj+euJJbMluNteS3UK8tptWsmhKd3pVdWKEuSsM8bF998tTmHmV1ShMiVhJdWVk9GBVOlPMGHzHpn6M+eBbB1IIrRc2fJlYp9hW/qE+MiqTvYA7PByAmwVb/Ahxf1wfUuJ+NKuQHaa0wA1mefebbZ/byqZrJ0yZ+F/Pglp1CqZAKPKm4rFn6IxZ9LOQcNlqCqD4W/MQDq30odCcQl+Pi44nA85tm/kngWnbHq09rSbPlZN7XRN6ZqJm3Aph3liFDBFCXPjg9gAmwMOELSamGDGg7oZB6uIeA8SgEwEEfRBBbW4G1V0A2IbvWQrSZA2kIxCi4xQUDurFuCW1bouEKTTFiCfJcSBXRO4we2cuFMRDNrfQv20MCALxwQpiq1Zg3UG5j88p/2UqvEkAER81Xbcjn4ruIb+mJkpOgXvrXsflia+S7rwTZ1++hott/pYr5gnBRgIp75qUE7DNgSGYyU7siJOHwQCLEsSO6h/Fytv8+xh0VgIQ2uXdXeLbX+atsUWcQEMrilHYAyrGA9SjxZAgfp/k+NtBKlnKIso/5S28CVPQmrIFMgSp85nC+9+Tn8TDzb5HZjeJoeYxPG2rAqVBeW+Ai+SLEXmgjZpihIn58n4nfdv3FHAV4eB9IPDrfvNYn/RX00i6wcHzyEYdO1ZMIcymNJitTovutcXjW6syYfEDbod/EhTDQcWhPz6DtQ==|920 \ No newline at end of file +}//Mqe8/BPqzKGc7i5PkyKsnT0ElqHwA4VGhQNzMgzd4YhEVPI2ShWZQle6Opf50AaQ/YtR9LLjcMl4k+JV02GzmoqlNAIKChj1+wwY7VwND699KdF9da+NfZnnFT4BKgHa8qvETKJRHokT6PCyGZ+8Im8ZORWPCoLhBas2aujByKu02mC56W/bzDJCRYOa+yIUHHCVGt5o0xLMSqfUqSyZcmMsBiN0XmHdyrnQWEcMyYPdkJRVTDlv4pruO6InTdb10hlisCs/lmMM1rbo9MLYq/CKgWO6kXrDjJoInEjFr0NvRAvrhsQKCaifdayu/4nVQfd70hPSruRQEwi7uOTdiaOuW6Q8I0nK/jOnXQz+LcnsfxfrMkeZd3BNGSJV+Nl6UQFUzgBtMpgf/LpDFbrRrhXbKmLJ0aeJh3ddRPXFzU0knq5q7NPFGVA+5UVsbChYeUreeBzgDYXb5UwJs7abIj8hX6CcRGQqxHCsAflPmrEilzlFxkzFuRSD51zrFoFunJwI4AqvuYttbGiz72bm0upCPHmU+emq0l4ZrNZynhW15kptijqTqr72JpH64alucbszQzq7aSAA8F7JsqTxsoHI7491Da1WLFqDfXHWEqqjE0fQEGMvMsYsuISJcHzCm7Aho1GB9jFEBC9ucOR+h/QsfDqZN/aRpkhW43ZAQs9MWoU9pURLPlz83PbqT50q8s/ajav7D6tybCOT8kZ8eZkNkTasfGKeeP62rnJ9+bS1G1kWG9pvi8vC8GCaCH5yizpWPrwQUNOqOVEhQQyugLvf7lrLxdzaI4YC+uxYx9g96wuu3DPUPVmxTNUaaQuQc4NdsiBkWi/BK13Jz8uv36XzpJjBmxLve015bQrRLZ9qjzE0YVaQmEByzL++8pg6rieBnKY/HkaoGQmT9ReP4A==|920 \ No newline at end of file diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index f1c2fe3403b6c7ece6e6800cce499af01e5702c8..fbf8fdf559dc087b49d7983deef98f35a47e6f3f 100644 GIT binary patch delta 10830 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 delta 591 zcmaKpJ!lhQ7{}kcH05z2whxy;NnucIO)*N3az6QO6y`FOOzll zWRMIZE@InLUJ1bp4QdXD7NUiu#&FswrL?Kq3XP!8iGzdq!hiWcU%%&hr<=Xg&F))A z_p5cr*bM27nmQlhi@)WxXk^iY&kr7v2hunl3nbl1#7B@Bhu-scv4cFlC88J2C6Hy7m2R}z< zo8bp`(Izv1Xs7r=;$LKRuNF;T#v*l}gLvxjUfFW^$pnp`55udpgOBH!r-Zw|6D;v~ zn0JZlFz+{_;cYs!?3T1$wF(i8@Sgu~C(7eI#9U#-vxXHSsz6kxckk2LJ#7