{"Message":"更新审批结算单审批页面","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/收益请款单表"},{"State":1,"Type":7,"Name":"Table/任务工时表"},{"State":4,"Type":1,"Name":"PCPage/办理结算审批单"},{"State":1,"Type":1,"Name":"PCPage/审批结算申请单"},{"State":1,"Type":1,"Name":"PCPage/收益中心-收益明细"},{"State":1,"Type":1,"Name":"PCPage/生成结算申请单"},{"State":1,"Type":15,"Name":"ServerCommand/生成请款单"},{"State":3,"Type":1,"Name":"PCPage/办理结算审批单-收益明细"},{"State":3,"Type":6,"Name":"Pages/收益/办理结算审批单"},{"State":3,"Type":1,"Name":"PCPage/办理结算审批单-单据信息"}],"Version":"v1"}

.collaboration

@@ -138,16 +138,7 @@
   },
   {
     "ModuleName": "Table/收益请款单表",
-    "State": 1,
+    "ModuleType": 7
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-07-01T13:48:24.1295758+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\收益\\收益请款单表.json"
-    ]
   },
   {
     "ModuleName": "Table/收款账户信息表",
@@ -470,16 +461,7 @@
   },
   {
     "ModuleName": "Table/任务工时表",
-    "State": 1,
+    "ModuleType": 7
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-07-01T13:45:23.9391965+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\工时\\任务工时表.json"
-    ]
   },
   {
     "ModuleName": "Tables/AI助手",
@@ -1272,17 +1254,7 @@
   },
   {
     "ModuleName": "PCPage/办理结算审批单",
-    "State": 4,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-07-01T14:28:09.280805+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\收益\\办理结算审批单.json",
-      "Pages\\收益\\办理结算审批单.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/收益中心",
@@ -1290,31 +1262,11 @@
   },
   {
     "ModuleName": "PCPage/审批结算申请单",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-07-01T13:47:33.848702+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\收益\\审批结算申请单.json",
-      "Pages\\收益\\审批结算申请单.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/收益中心-收益明细",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-07-01T13:47:24.1534736+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\收益\\收益中心-收益明细.json",
-      "Pages\\收益\\收益中心-收益明细.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/收益中心-变动记录",
@@ -1322,17 +1274,7 @@
   },
   {
     "ModuleName": "PCPage/生成结算申请单",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-07-01T13:47:14.5743221+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\收益\\生成结算申请单.json",
-      "Pages\\收益\\生成结算申请单.rd"
-    ]
   },
   {
     "ModuleName": "Pages/个人中心",
@@ -1780,16 +1722,7 @@
   },
   {
     "ModuleName": "ServerCommand/生成请款单",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-07-01T13:53:20.5314681+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\收益\\生成请款单.json"
-    ]
   },
   {
     "ModuleName": "ServerCommand/完成请款单",
@@ -2805,32 +2738,14 @@
   },
   {
     "ModuleName": "PCPage/办理结算审批单-收益明细",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-07-01T14:28:09.2809634+08:00",
     "ModuleType": 1
   },
   {
     "ModuleName": "Pages/收益/办理结算审批单",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-07-01T14:28:01.9839645+08:00",
     "ModuleType": 6
   },
   {
     "ModuleName": "PCPage/办理结算审批单-单据信息",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2025-07-01T14:28:20.8945504+08:00",
     "ModuleType": 1
   }
 ]

Pages/收益/办理结算审批单.rd

@@ -1,24 +0,0 @@
-{
-  "PageType": 0,
-  "ColumnCount": 33,
-  "RowCount": 26,
-  "Formulas": {
-    "20,1": "总金额",
-    "17,1": "TODAY()",
-    "1,27": "IF(展开审批记录,K26,J26)"
-  },
-  "CustomNames": [
-    {
-      "Name": "总金额",
-      "Formula": "办理结算审批单!$P$7"
-    },
-    {
-      "Name": "请款单ID",
-      "Formula": "办理结算审批单!$F$26"
-    },
-    {
-      "Name": "展开审批记录",
-      "Formula": "办理结算审批单!$L$26"
-    }
-  ]
-}

Pages/收益/办理结算审批单/办理结算审批单-单据信息.rd

@@ -0,0 +1,15 @@
+{
+  "PageType": 0,
+  "ColumnCount": 27,
+  "RowCount": 25,
+  "Formulas": {
+    "17,1": "TODAY()",
+    "20,1": "总金额"
+  },
+  "CustomNames": [
+    {
+      "Name": "总金额",
+      "Formula": "'办理结算审批单-单据信息'!$S$5"
+    }
+  ]
+}

Pages/收益/办理结算审批单/办理结算审批单-收益明细.json

@@ -0,0 +1,413 @@
+{
+  "Rows": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 22.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 45.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 10.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 31.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 553.0,
+          "Mode": 2,
+          "MinLength": {
+            "Unit": 1
+          },
+          "MaxLength": {
+            "Value": 1.0
+          }
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0
+        }
+      }
+    },
+    "Count": 6,
+    "DefaultSize": 22.0
+  },
+  "Cols": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 898.0,
+          "Mode": 2,
+          "MinLength": {
+            "Unit": 1
+          },
+          "MaxLength": {
+            "Value": 1.0
+          }
+        }
+      }
+    },
+    "Count": 3,
+    "DefaultSize": 32.0
+  },
+  "Values": {
+    "1,1": "收益明细信息"
+  },
+  "AttachInfos": {
+    "3,1": {
+      "CellType": {
+        "$type": "ElementUI.TableCellType, ElementUI",
+        "ElTableName": "EL表格1",
+        "bindingOptions": {
+          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+          "TableName": "任务工时表",
+          "BindingInfos": [
+            {
+              "GUID": "766834f9-c8aa-4760-8c9a-5ecf8b563c7a",
+              "BindingInfo": {
+                "TableName": "任务工时表",
+                "ColumnName": "工时日期",
+                "GUID": "bba486e3-aae4-41a0-bd37-fe09a952164d",
+                "AttachType": {
+                  "$type": "ForguncyDataAccess.DateColumnAttachObj, ForguncyDataAccess",
+                  "ColumnAttachType": 1
+                }
+              },
+              "ColumnName": "年度"
+            },
+            {
+              "GUID": "c9a31aed-1a2f-47e5-867e-7bc0ded469c7",
+              "BindingInfo": {
+                "TableName": "任务工时表",
+                "ColumnName": "工时日期",
+                "GUID": "39686de1-ef2b-4871-9b7e-343ed50b0f02",
+                "AttachType": {
+                  "$type": "ForguncyDataAccess.DateColumnAttachObj, ForguncyDataAccess",
+                  "ColumnAttachType": 4
+                }
+              },
+              "ColumnName": "月份"
+            },
+            {
+              "GUID": "2a24d856-b884-46ff-8b33-16f388137ae2",
+              "BindingInfo": {
+                "TableName": "任务工时表",
+                "ColumnName": "项目ID",
+                "GUID": "8e76cf09-1174-4b05-b9fc-1b6b2ebf53c0",
+                "RelationBinding": {
+                  "RelatedTable": "项目表",
+                  "RelatedColumn": "ID",
+                  "DisplayColumn": "项目名称"
+                }
+              },
+              "ColumnName": "项目名称"
+            },
+            {
+              "GUID": "9ad4f289-83ce-4ec1-84b9-faeabec44166",
+              "BindingInfo": {
+                "TableName": "任务工时表",
+                "ColumnName": "平均时薪",
+                "GUID": "3a319103-dc94-4156-965c-b7f89346f781"
+              },
+              "ColumnName": "平均时薪"
+            },
+            {
+              "GUID": "5e1b4ade-9bad-4bf1-ba27-d6a6c6b17467",
+              "BindingInfo": {
+                "TableName": "任务工时表",
+                "ColumnName": "总核定收益",
+                "GUID": "9517fbee-a2d0-4d03-980c-8a081aa2bd9a"
+              },
+              "ColumnName": "总核定收益"
+            },
+            {
+              "GUID": "495aa422-d479-4ab9-93dd-ff35714d74b7",
+              "BindingInfo": {
+                "TableName": "任务工时表",
+                "ColumnName": "总工时",
+                "GUID": "9061178b-87e7-40d8-93da-0cd4b81cf18d"
+              },
+              "ColumnName": "总核定工时"
+            }
+          ],
+          "SqlCondition": {
+            "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+            "ColumnBindingInfo": {
+              "TableName": "任务工时表",
+              "ColumnName": "请款单ID",
+              "GUID": "ff809989-7a43-47b9-bec9-a1a56b3eeb1b"
+            },
+            "Value": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "='办理结算审批单-收益明细'!请款单ID"
+            }
+          },
+          "OrderBySqlCondition": {
+            "OrderByColumns": [
+              {
+                "ColumnBindingInfo": {
+                  "TableName": "任务工时表",
+                  "ColumnName": "工时日期",
+                  "GUID": "eb63fde2-97dd-45f2-8d2c-76bf3af292d5",
+                  "AttachType": {
+                    "$type": "ForguncyDataAccess.DateColumnAttachObj, ForguncyDataAccess",
+                    "ColumnAttachType": 1
+                  }
+                },
+                "Order": 0
+              },
+              {
+                "ColumnBindingInfo": {
+                  "TableName": "任务工时表",
+                  "ColumnName": "工时日期",
+                  "GUID": "42615e76-a6b4-439c-a63e-d00fedd7fe9a",
+                  "AttachType": {
+                    "$type": "ForguncyDataAccess.DateColumnAttachObj, ForguncyDataAccess",
+                    "ColumnAttachType": 4
+                  }
+                },
+                "Order": 0
+              },
+              {
+                "ColumnBindingInfo": {
+                  "TableName": "任务工时表",
+                  "ColumnName": "项目ID",
+                  "GUID": "bbc823ee-59aa-452a-be00-dbf381709d86",
+                  "RelationBinding": {
+                    "RelatedTable": "项目表",
+                    "RelatedColumn": "ID",
+                    "DisplayColumn": "项目名称"
+                  }
+                },
+                "Order": 0
+              }
+            ]
+          },
+          "CustomColumns": [
+            "年度",
+            "月份",
+            "项目名称",
+            "平均时薪",
+            "总核定收益",
+            "总核定工时"
+          ]
+        },
+        "autoGenerateColumnsByDataSource": false,
+        "columns": [
+          {
+            "$type": "ElementUI.ColumnSetting, ElementUI",
+            "dataColumnName": "年度",
+            "allowRoles": [
+              "FGC_Anonymous"
+            ],
+            "label": "年度",
+            "colStyle": {
+              "formatString": "0\"年\""
+            },
+            "colHeaderStyle": {
+              "horizontalAlignment": 1
+            },
+            "cellType": "default",
+            "autoMerge": true,
+            "key": "4bddee2f-26d0-45f3-bdcc-7cdb6966a228"
+          },
+          {
+            "$type": "ElementUI.ColumnSetting, ElementUI",
+            "dataColumnName": "月份",
+            "allowRoles": [
+              "FGC_Anonymous"
+            ],
+            "label": "月份",
+            "colStyle": {
+              "formatString": "[DBNum1][$-804]General\"月\""
+            },
+            "colHeaderStyle": {
+              "horizontalAlignment": 1
+            },
+            "cellType": "default",
+            "autoMerge": true,
+            "autoMergeBasedColumnName": "年度",
+            "key": "bdacb6e4-0faf-4744-80ab-5da330367982"
+          },
+          {
+            "$type": "ElementUI.ColumnSetting, ElementUI",
+            "dataColumnName": "项目名称",
+            "allowRoles": [
+              "FGC_Anonymous"
+            ],
+            "label": "项目名称",
+            "colStyle": {},
+            "colHeaderStyle": {
+              "horizontalAlignment": 1
+            },
+            "cellType": "default",
+            "resizable": false,
+            "key": "608bbd29-a995-43c4-a9f8-fdfd0a4cbc66"
+          },
+          {
+            "$type": "ElementUI.ColumnSetting, ElementUI",
+            "dataColumnName": "平均时薪",
+            "allowRoles": [
+              "FGC_Anonymous"
+            ],
+            "label": "平均时薪",
+            "colStyle": {
+              "formatString": "0.0\"/小时\""
+            },
+            "colHeaderStyle": {
+              "horizontalAlignment": 1
+            },
+            "cellType": "default",
+            "resizable": false,
+            "key": "81628602-8d39-4427-a02f-2cc2208dfc91"
+          },
+          {
+            "$type": "ElementUI.ColumnSetting, ElementUI",
+            "dataColumnName": "总核定收益",
+            "allowRoles": [
+              "FGC_Anonymous"
+            ],
+            "label": "总核定收益",
+            "colStyle": {
+              "formatString": " ¥#,##0.00_);[Red] ¥(#,##0.00)"
+            },
+            "colHeaderStyle": {
+              "horizontalAlignment": 1
+            },
+            "cellType": "default",
+            "resizable": false,
+            "key": "0446f827-b5b1-4bc2-ac17-7153204c1e91"
+          },
+          {
+            "$type": "ElementUI.ColumnSetting, ElementUI",
+            "dataColumnName": "总核定工时",
+            "allowRoles": [
+              "FGC_Anonymous"
+            ],
+            "label": "总核定工时",
+            "colStyle": {
+              "formatString": "0.0\"小时\""
+            },
+            "colHeaderStyle": {
+              "horizontalAlignment": 1
+            },
+            "cellType": "default",
+            "resizable": false,
+            "key": "ab544a7a-4220-4e26-a404-f0b086ed9df9"
+          }
+        ],
+        "actionButtons": [
+          {
+            "$type": "ElementUI.ActionButton, ElementUI",
+            "type": "button",
+            "Name": "编辑",
+            "shape": "default",
+            "allowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "$type": "ElementUI.ActionButton, ElementUI",
+            "type": "button",
+            "Name": "删除",
+            "styleType": "Accent 5",
+            "shape": "default",
+            "allowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "sumText": "合计",
+        "size": "default",
+        "stripe": false
+      }
+    }
+  },
+  "StyleDatas": {
+    "Styles": [
+      {
+        "FontFamily": 0,
+        "FontSize": 16.0,
+        "FontWeight": 1,
+        "Formatter": 2
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332
+      }
+    ],
+    "Types": {
+      "Strs": [
+        "Body",
+        "Bold",
+        "[AUTO]General"
+      ]
+    },
+    "CellStyles": {
+      "1,1": 0,
+      "3,1": 1
+    },
+    "SheetStyle": {
+      "FontFamily": 0,
+      "FontSize": 13.333333333333332
+    }
+  },
+  "Spans": [
+    "1,1,1,1",
+    "3,1,2,1"
+  ],
+  "PageInfo": {
+    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+    "Title": "收益明细",
+    "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": [],
+    "RelatedDataTableName": "付款凭证表"
+  },
+  "PrintInfo": {
+    "PaperSize": {},
+    "Margin": {}
+  },
+  "CustomNames": [
+    {
+      "Name": "总金额",
+      "Formula": "#REF!"
+    },
+    {
+      "Name": "请款单ID",
+      "Formula": "#REF!"
+    },
+    {
+      "Name": "展开审批记录",
+      "Formula": "#REF!"
+    }
+  ]
+}//VeXcH9nToKBA/JPpT2YxsS4d8+5stCU4VF3V4GlBXqDsDGDtbvoSXziBnrwoBfkt8wR519FhonHmU4ihNWZ4/yzUPOLLW2wlKzyCulBzU7pA5sE7sSs27wl0lcwyVtD9ikI9kBhUF0aH59+AaQSLdzBDs6CwEpJlmfmUk1eaPmL8KISMAG5RdR3m029PhdEzFByvqipnTx1zsx6cH/Qn6HkjKs8bdcPUPsRbebR/9jd1Nffi5Nr6EdE9brETPRTMn2MAdooveOlzmXcEDWER4kvYJ3LpN8MOqj87/khB4HOUMiXNVB7+732mx2paTtCxad6pBlTNzbB/LXLAyO8FUIt4FJXVe/H2Veljt9zY5aj6sXtayWrSQjt/SsIwelscsoi/GzRxUGTH5MmgyZ7Swisl1GtRCK/HzEV6xuAJw2Ps8ESm7NYnFMRgwqKuaa8HiexG2AHRi4VfeNY2EfRPXgnHKfRPH0zu3n1dm899U5jWfvT/j6kNrymuOkJLccIRs6xmYw1pbkvgRnf6lhBuUqGWjqfSx7cR/me8/L5ssjpG9cIQcs13O3asj1XiNIGy5DERKxhqH1K0uELoo0CBktD94+/YDXsLKDLqh/jAPmcF/U9p9I4aS4jjEfN7cJ8KfBD+ahZnwHE4NPUdyFUycs+rmH/U3JWlpgOZMQvYMKH36oF5g5o1DYRepCzwwFMSclaQA85y/R0Q138V20zIA8+K3Jf6rcaWojypQeKKIjxDMuHlsl2dvwAnUsmNkHCmHHvdcPTcFanjg59KNq7pyLs/H6yN+n+uomWSbob6etd/XAgRGXIz3EhZMhIrA3RoB/E07YcqzPpAcPfmRk3dsNIERop/sNw6qtPOqCfrocLaga+vVxHg90ZzyhkG2W1AnMweKaVfyrcRgOgNSeckMg==|920

Pages/收益/办理结算审批单/办理结算审批单-收益明细.rd

@@ -0,0 +1,19 @@
+{
+  "PageType": 0,
+  "ColumnCount": 3,
+  "RowCount": 6,
+  "CustomNames": [
+    {
+      "Name": "总金额",
+      "Formula": "#REF!"
+    },
+    {
+      "Name": "请款单ID",
+      "Formula": "#REF!"
+    },
+    {
+      "Name": "展开审批记录",
+      "Formula": "#REF!"
+    }
+  ]
+}

Pages/收益/办理结算审批单/办理结算审批单.json

@@ -0,0 +1,360 @@
+{
+  "Rows": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 22.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 45.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 31.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 29.0
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 717.0
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      }
+    },
+    "InLogicalVisibleIndexes": [
+      7
+    ],
+    "Count": 8,
+    "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": 36.0
+        }
+      },
+      "15": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 36.0
+        }
+      }
+    },
+    "Count": 34,
+    "DefaultSize": 32.0
+  },
+  "AttachInfos": {
+    "1,1": {
+      "CellType": {
+        "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon",
+        "PreCommands": [
+          {
+            "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+            "Title": "加载中",
+            "VBalidate": true,
+            "BreakpointIdentity": "7a580def-bfe3-466d-b8f2-06770718fe7e"
+          }
+        ],
+        "PostCommands": [
+          {
+            "$type": "Forguncy.Model.IgnorePageDirtyCommand, ServerDesignerCommon",
+            "BreakpointIdentity": "3b7fc616-0442-4fe3-868b-196c98874dae"
+          },
+          {
+            "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+            "FunctionName": "remove",
+            "Title": "加载中",
+            "BreakpointIdentity": "b0ce8cc7-5d0a-4430-9d0d-3b58eebda30e"
+          },
+          {
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                    "cellLocations": [
+                      {
+                        "SerializeProperty": "=Action.Name"
+                      }
+                    ]
+                  },
+                  "value": "暂存"
+                },
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+                    "TargetPageElement": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=办理结算审批单!B2"
+                    },
+                    "TargetType": "Forguncy.ProcessPanelCellType, ServerDesignerCommon, Version=10.0.104.0, Culture=neutral, PublicKeyToken=967100671921c115",
+                    "MethodName": "Refresh",
+                    "BreakpointIdentity": "b2e9a392-b31a-4d1d-b9ce-17e62d9143e5"
+                  }
+                ],
+                "ID": "812e2b9b-d9b2-48cd-9e90-e68873ef6a90"
+              },
+              {
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+                    "BreakpointIdentity": "3221b09f-dc50-4766-9e57-8b39fd9b1261"
+                  }
+                ],
+                "ID": "8f77b3b2-62ff-46d1-a4ff-4f6fa6b75ad0"
+              }
+            ],
+            "BreakpointIdentity": "083b07a8-fb72-40df-a59b-aa8117a68515"
+          }
+        ],
+        "TemplateKey": "同意",
+        "ActionButtonStyleTemplateInfos": [
+          {
+            "ActionTitle": "提交",
+            "TemplateKey": "同意"
+          },
+          {
+            "ActionTitle": "同意",
+            "TemplateKey": "同意"
+          },
+          {
+            "ActionTitle": "回退",
+            "TemplateKey": "回退"
+          },
+          {
+            "ActionTitle": "暂存",
+            "TemplateKey": "暂存"
+          },
+          {
+            "ActionTitle": "结束",
+            "TemplateKey": "拒绝"
+          },
+          {
+            "ActionTitle": "拒绝",
+            "TemplateKey": "拒绝"
+          }
+        ]
+      }
+    },
+    "3,1": {
+      "CellType": {
+        "$type": "Forguncy.TabControlCellType, ServerDesignerCommon",
+        "TemplateKey": "_RS_NewFashionStyle1",
+        "Tabs": [
+          "办理结算审批单-单据信息",
+          "办理结算审批单-收益明细",
+          "FGC_审批记录"
+        ],
+        "LazyLoading": true,
+        "OverflowMode": 1
+      }
+    },
+    "7,1": {
+      "BindingInfo": {
+        "TableName": "收益请款单表",
+        "ColumnName": "ID",
+        "GUID": "e63be71c-a03e-40b4-89e5-4a4c54dae715"
+      }
+    }
+  },
+  "StyleDatas": {
+    "Styles": [
+      {
+        "FontFamily": 0,
+        "FontSize": 16.0
+      },
+      {
+        "FontFamily": 0
+      },
+      {
+        "FontSize": 14.666666666666666,
+        "Foreground": 1
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 14.666666666666666
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": -1.0
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332
+      },
+      {
+        "FontFamily": 0,
+        "Foreground": 2
+      },
+      {
+        "FontSize": -1.0
+      },
+      {
+        "Formatter": 3
+      }
+    ],
+    "Types": {
+      "Strs": [
+        "Body",
+        "black",
+        "Text 1 50",
+        "@"
+      ]
+    },
+    "CellStyles": {
+      "1,1": 0,
+      "2,32": 1,
+      "3,1": 2,
+      "6,1": 3,
+      "6,2": 3,
+      "6,3": 3,
+      "6,4": 3,
+      "6,5": 3,
+      "6,6": 3,
+      "6,7": 3,
+      "6,8": 3,
+      "6,9": 3,
+      "6,10": 3,
+      "6,11": 3,
+      "6,12": 3,
+      "6,13": 3,
+      "7,1": 4,
+      "7,2": 5,
+      "7,3": 5,
+      "7,9": 6,
+      "7,10": 6,
+      "7,11": 7,
+      "7,12": 7,
+      "7,13": 7,
+      "7,14": 7,
+      "7,16": 8
+    },
+    "SheetStyle": {
+      "FontFamily": 0,
+      "FontSize": 13.333333333333332
+    }
+  },
+  "Spans": [
+    "3,1,3,32",
+    "7,1,1,3",
+    "1,1,1,32"
+  ],
+  "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": [],
+    "RelatedDataTableName": "付款凭证表"
+  },
+  "PrintInfo": {
+    "PaperSize": {},
+    "Margin": {}
+  },
+  "CustomNames": [
+    {
+      "Name": "请款单ID",
+      "Formula": "办理结算审批单!$B$8"
+    }
+  ]
+}//og6U6f6PP8xk/Vqs4kHG9looZHtQNigAMjZ7sN2T6bqbS3LM3g6XLWDsfp+p9k1ra0B7xekjpNFpt+lh1bSGB9pcsugCC5Xul2eKccnY7A7RWi6qTNFJnl/7F3mxU3SedoX/tsZX6SXDNZpBVi3slcMhVMYB19IotMH4kKlPul3rC/u4xoyIzSu1L3kqOQ2kKdO/u/pV3+/VL0/MIV0QXWo68/zZShi+DNkL3II90kOsfqYzwGSXpMY+X4wfTl3NBQWuGrkn2Qql3ajSUzqFFXGShMhP1baiyd24D7omsrjBpMVTCgcxBKfIA/702sVtpxFHu3RE/26z0F4hirdTvTfdXxtS5wBzub9R0+aSO5QOdMxwNJzKf75Jo9PMzJ3/6V50vyd15PPixJQcEDyAmiXciQ4qgXv2H0w8Kn7kBCsNiWAk+KrK6jtTQn93ke3ZgJ3SFx4W5c+yaH9yem39olKb34RHuz8rgJP506FN4hE68dFNIi7Vqyq2wyBlP173oojsvHsx6TSnjFXRhse8l2LgKF77ChCrn5UepFOT0rtOLw45t5Cpm6p/wzPoPsyxR7MwbW2Heqt4tN2SB8PrIUILtB62ZatqymYzTId59kANJp37l9X8jEVEOhPd0m6FwOjUa84+Cjm+UhGV9VkpLmevd/2q1seeuVuyq6C1naUgTisc5nTQ/2tPrVROlFsJcn6JkirWArTEod9p/rSlUm5C3n2bx/5IfamVZkl1XetQopxy2hUxJ5FiAJF6gqHhhvzBDiik/toCupDVMuph60IzuPt75/x+HKABQ0sjAxPsENMK5s8mKL4zvAhU+geYzk+p3cKavB1n0V+k8x6AwD4EQd3OYuGEe2MMHpzrnZ93WWoSKuTZ7F8heJlyGZjVgZsQ9Aqp7fSGthsq227kMw==|920

Pages/收益/办理结算审批单/办理结算审批单.rd

@@ -0,0 +1,11 @@
+{
+  "PageType": 0,
+  "ColumnCount": 34,
+  "RowCount": 8,
+  "CustomNames": [
+    {
+      "Name": "请款单ID",
+      "Formula": "办理结算审批单!$B$8"
+    }
+  ]
+}

Pages/收益/审批结算申请单.json

@@ -254,7 +254,7 @@
                     "BreakpointIdentity": "2137a39a-486e-4acc-b1ab-8f0467eb6595"
                   }
                 ],
-                "ID": "6481eb5c-d855-43ba-a72e-316da1c1c030"
+                "ID": "ee2cd9e7-3bb3-40db-a221-32e4b611924e"
               },
               {
                 "CommandList": [
@@ -263,7 +263,7 @@
                     "BreakpointIdentity": "d3aa8945-82a5-4e8a-8b5d-b21473d71cf7"
                   }
                 ],
-                "ID": "7713f840-682e-44d3-98fe-2462f918795a"
+                "ID": "55ecd2a0-2aa4-4339-81bb-d8d64b76696b"
               }
             ],
             "BreakpointIdentity": "90856d3d-aa34-4823-9218-a8457a619926"
@@ -384,7 +384,7 @@
                             "BreakpointIdentity": "5208b049-3047-4ab3-8c8b-1861bcc64cc3"
                           }
                         ],
-                        "ID": "d74f9c43-eb1f-4197-a24c-0a2b7a18f7c9"
+                        "ID": "310958de-193f-4f5c-b4ef-41af1699b16e"
                       },
                       {
                         "CommandList": [
@@ -398,13 +398,13 @@
                             "BreakpointIdentity": "75b0bdc6-3493-4db6-9a36-214a7fa5fd71"
                           }
                         ],
-                        "ID": "173c0437-9cd8-474d-a4ec-fe7490c7f70c"
+                        "ID": "933f1103-a813-44f1-8b47-4191f9d60435"
                       }
                     ],
                     "BreakpointIdentity": "541c2512-87bb-482d-a2f0-bde5ec41e70d"
                   }
                 ],
-                "ID": "63d8a6d2-a1c3-44be-9d3c-b63e315222b5"
+                "ID": "94c99859-36b0-4f89-a980-ea9bfcd4b72c"
               },
               {
                 "CommandList": [
@@ -415,7 +415,7 @@
                     "BreakpointIdentity": "05ce71cb-755d-4954-99c8-f91836440164"
                   }
                 ],
-                "ID": "7395c400-cb98-4a3d-b597-fbd48c1cd8b3"
+                "ID": "0da659f4-f06c-4720-a4f2-c1515771d3b2"
               }
             ],
             "BreakpointIdentity": "01c4fda3-46a5-4f4d-9fc4-bc6a985490a2"
@@ -804,13 +804,15 @@
               "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
               "ParameterName": "计算总金额",
               "ParameterValue": "0",
-              "ID": "ad960492173f41e196aac5a0f47c155d",
+              "ID": "178664e93da746978b885f62e5fa0174",
+              "Disabled": true,
               "BreakpointIdentity": "f6c97cba-6886-4366-b02e-80386a722556"
             },
             {
               "$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\n\r\nvar data = Forguncy.CommandHelper.getVariableValue(\"选择项\");\r\nconst totalPrices = calculateSum(data, \"收益\");\r\nForguncy.CommandHelper.setVariableValue(\"计算总金额\", totalPrices);\r\n",
               "ID": "5c32e8400b854052a7446e0c8b16063e",
+              "Disabled": true,
               "BreakpointIdentity": "0a81d4e7-0a9f-441b-aafd-5d4bfd01a75d"
             },
             {
@@ -823,6 +825,7 @@
               "OperationParamaterAName": ",",
               "OperationParamaterBName": "ID",
               "OutParamaterName": "ID字符串",
+              "Disabled": true,
               "BreakpointIdentity": "53e04b5f-4ef3-4cc8-b51b-5a0ec90a89f2"
             },
             {
@@ -849,6 +852,7 @@
                   }
                 }
               ],
+              "Disabled": true,
               "BreakpointIdentity": "f766838d-b02d-42b7-9a6c-e87806b1d19f"
             }
           ],
@@ -919,10 +923,10 @@
               "GUID": "5e1b4ade-9bad-4bf1-ba27-d6a6c6b17467",
               "BindingInfo": {
                 "TableName": "任务工时表",
-                "ColumnName": "预算收益",
+                "ColumnName": "核定收益",
-                "GUID": "e73399d1-bf7c-4e8f-bd07-553f794cec81"
+                "GUID": "138253c9-f27c-4c11-b745-2f3660cb4d11"
               },
-              "ColumnName": "预算收益"
+              "ColumnName": "核定收益"
             }
           ],
           "SqlCondition": {
@@ -937,7 +941,14 @@
               "SerializeProperty": "=审批结算申请单!请款单ID"
             }
           },
-          "CustomColumns": []
+          "CustomColumns": [
+            "ID",
+            "工时日期",
+            "项目名称",
+            "任务名称",
+            "核定工时",
+            "核定收益"
+          ]
         },
         "autoGenerateColumnsByDataSource": false,
         "columns": [
@@ -999,7 +1010,6 @@
               "FGC_Anonymous"
             ],
             "label": "日期",
-            "formatStr": "yyyy年MM月dd日",
             "width": 130,
             "colStyle": {
               "formatString": "yyyy年MM月dd日",
@@ -1034,7 +1044,6 @@
               "FGC_Anonymous"
             ],
             "label": "时薪单价",
-            "formatStr": "¥#,##0.00_)",
             "colStyle": {
               "formatString": "¥#,##0.00_)",
               "horizontalAlignment": 1
@@ -1052,7 +1061,6 @@
               "FGC_Anonymous"
             ],
             "label": "提成系数",
-            "formatStr": "0.00%",
             "colStyle": {
               "formatString": "0.00%",
               "horizontalAlignment": 1
@@ -1097,12 +1105,11 @@
           },
           {
             "$type": "ElementUI.ColumnSetting, ElementUI",
-            "dataColumnName": "预算收益",
+            "dataColumnName": "核定收益",
             "allowRoles": [
               "FGC_Anonymous"
             ],
-            "label": "预算收益",
+            "label": "核定收益",
-            "formatStr": "¥#,##0.00_)",
             "colfixed": "right",
             "colStyle": {
               "formatString": "¥#,##0.00_)",
@@ -1231,7 +1238,7 @@
                     "BreakpointIdentity": "bea59377-20fd-43fc-9aea-ed95a81a38b7"
                   }
                 ],
-                "ID": "a01ded23-4b7c-4a1b-a3b5-6b81888f4891"
+                "ID": "77dbcfbb-48e5-4c11-a62f-70ff4cd12aec"
               }
             ],
             "BreakpointIdentity": "a511ca8a-3b3e-45b3-a0ae-8c7068f0f227"
@@ -1610,4 +1617,4 @@
       "Formula": "审批结算申请单!$F$18"
     }
   ]
-}//g4w2ViY2c/C9LXdVYa2CN1jvLgnqnqysp5Y7YudcdvaCxYxdEfdFmXuxMF03gYpIR7jnV4YyLUEK1VzeSOg1E3aHdMXVGlBk/IKqhS6vuFzeuR6+P1xKyxJmQbKdh3JAmYT9bhS0X6r2l1/hZBzIgAtN6nyDk2+oxMgT8Po3oek8iDibJIRgJQ8xr3WxokDgB552nHRKDj+etA88FB1mS7jD6naZFQOV9S4eDK0v8jpjJ01uIPP+K3fOVI+LtAkXZtwb/rJSSNz0r9hNjai7z2OwLdQhFIPsj4sGSCsKpf01m/gXdYGg27wJy+y/0l8ALdw8EQeIWQDi0/KSx1vSaJHpDMU2uVuKTb1GPlpKLRT5U6zBgEUlSi8eQucGkgSbfj+C7x7Yc/qWCHRAr00CeR8rj3142D2z54lv5m19oXvp+eAJ2xsxf668kBa2yZJGzfsIzWyVkyI6hHzQIEGNHsSHMSISYXXS8DMCy3H5e8QNLJcwrHVB58mvU6FWDWtJWHi8P/nf4ZuKP575Sjtmt6RJTdX23G2B5bYc4U/Jp1/bZIV6ofM5jzVoHgSDjJRpoMnLiETQJXcYl5zgWwGWu+5o1SRVzsfvvf/g9AheWD+oec1zQ8wJyjBQ1JMJrHrvuNcnMOymRCDJgIeWLDTk1dTboV3cKMjSeZSXd5PeHC1nWC6KE7Ga+Hv/rOv5jJigCcjUn81zB5mB1N16E9DxXBKg86TiMQd6oSkYkS6Ee7sCEQauX+gwZw1qgmA/epm85xaEQ8u2B+7o9QyhbJSs++wjZw1P40M+KWmbIjiyPEimlBEqZMMLJ9+LlqjgxLqs8ZwVbBU8onebXpgArNXBQ1xL7qxG1EsdrKpAXbVPRWL2MvjrEdzR9LsJtJkOvuwZ5AkGaxO5y4M1Xqv1Uo468g==|920
+}//iex3+T7+ZAQV7ZUlATbLLks8/o4GaDSoQtEIQdYCET+A5iWpcV0LoV1A0nxUGzMcuQ/Qe8OJh2LDrPPdAfJJFZ8J6ka2q1Bxs8rEWeekp7tumPKJhC1sAk3ZdbywxASz8moF/hB9nMeLj0GswzbHzcr9kJ9UzSbaCQ5xNRmN/Ye6jxZ7+0wSIhL/YfcbXt/FutMto1vz0J8bFOhIr71+zsZ30AHyeFRLRm48uZF9JvsT29xjtyKDe4Mdj8rySTDb/J/bE4G/2oN1OQpTpimIj6bj7g9bzKcK+cB0p12dmwa1TYPLK4G7dN/pJH/sbsW0HXmQZQarqPDDgUc3L0RuaY6Ny5HNMJIPIE7uvovKnAaop3q1AnJ86Zbwl5Y2F6PWFj0zQpAvrbID8YBsHiMYW4oYZeOx+iFFVfYCsP8/40ALX2Lt2TDCQF9iaLSR4twUzSSKvdsdUDI6Zg6kCrVATCFmT29p85Y0YQtEciSPYurDe1xDtP+gJmM1fwUmDwpvLaC4o+DjuHyVNCv4UNzJaV4/F5XXBvtJ6N/z8rJIFSLxA8G3ol4JYuKG550CesECxg2DNNwDDfeV/7W2MkCF9PIu01Q6btPQefZ4Lb+8CXyJKg9kSi1t2fPkMyL3ks9X87txptITcS62Uydu5sUNwehiEEnK4/BBdZqWVEJmgsxWH3mP7Tw+6YFsS6DHBLAfCkxiGiusLlPyTT87hhk2zsUNsIjcgyvd7+ZP9MdH42HZYL335BCEYynAkWKsdQ1grhnBHns0afpzPfwueg8SFTPAZ+XI1SazCSNiQHTonR2u5xEG2qvOoSPsvWbG7xH+pl19+3JPvmVjSP7TFNQ7tj31pmBymp5AJNYPYrNZ03++01UA16tDUnqYcHfRvg6r6vTHdTNxvbhqKrFkTB1ZyQ==|920

Pages/收益/收益中心-收益明细.json

@@ -382,10 +382,10 @@
               "GUID": "87d5b54f-938c-4b94-9bda-c8d6f0ed9b8e",
               "BindingInfo": {
                 "TableName": "任务工时表",
-                "ColumnName": "预算收益",
+                "ColumnName": "核定收益",
-                "GUID": "7430d011-c05e-47c5-a587-4c064e74ad31"
+                "GUID": "8e3a4194-1687-4f9d-b357-e49797e5d396"
               },
-              "ColumnName": "预算收益"
+              "ColumnName": "核定收益"
             },
             {
               "GUID": "79921239-1d33-4b37-a676-ff2c6374fe90",
@@ -430,7 +430,21 @@
               }
             ]
           },
-          "CustomColumns": []
+          "CustomColumns": [
+            "ID",
+            "工时日期",
+            "项目名称",
+            "任务名称",
+            "工时类型",
+            "执行人",
+            "时薪来源",
+            "时薪单价",
+            "提成系数",
+            "上报工时",
+            "核定工时",
+            "核定收益",
+            "请款状态"
+          ]
         },
         "autoGenerateColumnsByDataSource": false,
         "columns": [
@@ -459,7 +473,6 @@
               "FGC_Anonymous"
             ],
             "label": "工时日期",
-            "formatStr": "yyyy年MM月dd日",
             "colStyle": {
               "formatString": "yyyy年MM月dd日",
               "horizontalAlignment": 1
@@ -557,7 +570,6 @@
               "FGC_Anonymous"
             ],
             "label": "时薪单价",
-            "formatStr": "¥#,##0.00_)",
             "colStyle": {
               "formatString": "¥#,##0.00_)",
               "horizontalAlignment": 1
@@ -575,7 +587,6 @@
               "FGC_Anonymous"
             ],
             "label": "提成系数",
-            "formatStr": "0.00%",
             "colStyle": {
               "formatString": "0.00%",
               "horizontalAlignment": 1
@@ -625,7 +636,6 @@
               "FGC_Anonymous"
             ],
             "label": "预算收益",
-            "formatStr": "¥#,##0.00_)",
             "colStyle": {
               "formatString": "¥#,##0.00_)",
               "horizontalAlignment": 1
@@ -982,4 +992,4 @@
       "Size": "3,18"
     }
   ]
-}//N3WMnDKJgefT49MYiZZh+IWa7NDERona3AIWXUzTBGeaV/Clm1cEPLGKLzzLQyA5uDsTWpR8Haj37lOcd81l7fQiSeHWL88hYfYm2U0mXqt6PMG9of9fqsyZg5hudV1jZVu7Ra2FFrE23omf0r5I1MSea+sQvSmYgsDdp+BGpSphRGaBBJFFx0Pz5YNrQtAAK1XEU1e0+8Kpr6UAy/2AcbVWXLTnbID0juAkykgulGqKLmA6nYbItOjaO5RCGWLDbmoLNFao3Z0faWuCue+3JvgqTMinZemdrF1KWL2Cfdd9+GveSGA5rZPbFIS4b1E894jzwzKZOQAw6LcaaZ4o0USCMAvL+myD7pJh68RrBkmlBVGZdaTZgTMBUTecBfcikj39V0BPtSKpt2Ox6C7Pygv9ssWKDjU1mBYqxj/9rLYIJJfgH4R6sMHVDOuE3BSEEO4p7ZcphnWopCRyuSZzR9NEKbZw5AlBe8cE0Tnm4Q8LE3TL/JUcW0shKM2Ur5FCjm4x9J9Espx43S5wzIMUjqgj2DwSkNz1r6jEhVOmfKTEMwTUnDsKiQKxaWGgnixGZ/ms3RDV+8GQI2DhcLDf39bNijyZw4FtAWVlQ5GEjOBwAsas0J+4CMsZyCzD9jI+/k2UmbYgHkFRs7pdSaM07LSqMFeT/C9jTxbMfU1QBsRgNFrDvHmiia6VAje5jIw8D3evqADvpQ+7P7OsdAk4M1ctwQtUudnROJDBiQ8QMVC85EasGYoJdkFgSj3lYBd/RabXLQj6rvvKDz4GuijOKNAyBESLlfOUKSz/krZQ4HIVAt951PxOI3kLcunV1jCBOKUpaX09rMBgDrB02cyxfeLcvXV4XCUtQKfgSNaISAG3Q6NeKBCIeTXyIrwgarHOrGYtBu/i6YugWJus1pBwHw==|920
+}//hlyrxx0rE5a6lNxQjgb6z1PUDpd52vx5AjHZUZhHB2Bl5ZO4B5mfVr7aZfBh40Qr1NOpUNtX+galGH17bCEQk8E3zHQxGmE1LtQxnHJUa7znzEHgkGcquFR5N6MdKFBcupZOfThqHXyyV66ipCWHyylvlknDLdVIZ+zF4m2cL53wdv4TqeK54Zmj3vYO8iBP2aCUL8f8En+wQS3R8efRwqdvC3Pq8kOrCDqnRJq7jWk5IeZpb1bksz7qWaoJc9b+bKV+9lG78NRy6u2fgDPQpBea92xTDGa/Aa6OfA6nmYLwq6Zxs7grRa11im6+p3Lh+5NeRWu+66W1EIuQ+JgvLrRvq4C78mKp5GabwqVRlimW1RIK+7BUAY7n/QYBn53r1+Q4parpXRPLvZS4NGryKaqj+w+oeCLAtMU5ZrEkx21duh2fmoaeYyQRA8o85TR9zR+L7gkis35v8RLQBoyQIROrngBoqgBwXKp8VyuFcD77TfMy5jdC0fyhTttlTobBfIPsvLePn/54oD+T/+qXjjJJdLRzrJJZmLHUBSLR8YmaRvFHv9VnS1tI7kGmHfSA7gNJiEtgZVDo30rdW7hqL775XE1fRb+6+sJ3w2xoj5JIFQcN8Uaov218oRxHHqMsRkrng6uRe0RR//ZAWSu3jQiVUp1A5+mf+WoH9yQhJwYbyDCSmJzoJa0kxJnYCd/AryionePjFMQKr1GDXXqiaN/xLARPQ3Pxo1OH924IlHS5Tt41pT5qWi8f4VDEtZ/UpA84awC3cow+bjivIF/s45zoW9thtbqvr53kAN2jjJWGKd0zWsEh3MWh5Fnnc4of+jwT25DAD2wl3n/O06LLCktUiGOV3pmXQnKDN1H/xusMkeo0WZ7x4855O9XPiQTfn2yrTQncyEBGSYucUB8BHQ==|920

Pages/收益/生成结算申请单.json

@@ -294,7 +294,7 @@
                             "BreakpointIdentity": "7ae1633f-ac19-4dca-bdce-a4e43c0129e4"
                           }
                         ],
-                        "ID": "05450b65-0c91-41d9-b33a-19987841951f"
+                        "ID": "1b7f9514-c168-47f5-8a19-8dce3359cc26"
                       },
                       {
                         "CommandList": [
@@ -308,13 +308,13 @@
                             "BreakpointIdentity": "28b82df2-ddde-45f7-937c-ae8ff56efade"
                           }
                         ],
-                        "ID": "14ce9709-d974-4ee0-a039-bb3660ef1c08"
+                        "ID": "79e86383-19ad-4691-bb0f-4ae3bf27e6df"
                       }
                     ],
                     "BreakpointIdentity": "43c7eb20-b0f0-4c86-804b-fe485e876a71"
                   }
                 ],
-                "ID": "ee0b6f64-6f89-4375-bbfc-b04b4c2184ff"
+                "ID": "58ba2a90-c982-46d9-ad7d-8b5d685285f9"
               },
               {
                 "CommandList": [
@@ -325,7 +325,7 @@
                     "BreakpointIdentity": "0998dfd3-3863-44b0-80db-d53a7b86c2b0"
                   }
                 ],
-                "ID": "e202cc46-da90-4fa8-a9fd-41f752617151"
+                "ID": "6c12d249-bc1a-41c6-8c48-1c116b3ebd5e"
               }
             ],
             "BreakpointIdentity": "63226f95-d7d9-42c6-9a09-77015cbb2d07"
@@ -503,8 +503,8 @@
               "GUID": "5e1b4ade-9bad-4bf1-ba27-d6a6c6b17467",
               "BindingInfo": {
                 "TableName": "任务工时表",
-                "ColumnName": "预算收益",
+                "ColumnName": "核定收益",
-                "GUID": "24631ec6-e1ef-4819-a036-18b6874158b7"
+                "GUID": "18f8b5d2-cfaa-40d9-abfd-0f27ba85d83a"
               },
               "ColumnName": "核定收益"
             }
@@ -935,4 +935,4 @@
       "Formula": "生成结算申请单!$E$7"
     }
   ]
-}//IRQ0ZgeymN5/86jnUcm6Wm1HVc4Y+nMumWeoqyCXWp/uVLXCe/rfXUhOG7kX4FT4HoXebtHOCdD7LYX/sww6XpJirzgJUcTnQGfxwbwSk1jVnadvHk437hMsHSsUCn7AGbEJ5V/AxV8N34rpA7vlhK3fRvbYqapZkH0Cab92QlwcXHus7/9JNNigast/CMc5ArhgpUj0f7gfNI5xDBFLszFiDfvvtsFTrF4jBB0oPbjeAV4YZrjrSBr5Nd3+EzuLncywBK3NOre/yi5tfLuFZGvofCENZrGcJtgZrOoA4bK5k3jNwJW0/qxCTwTDEdi2glVFlq2MDytq/btWWeZbYyh4jCaGwNoN/LaM/KlCne0zLfMsF5y1I1eRvtbrN9Lem3i9QIRftBvRknMDIy121BntIrwbwTJr5gGzuY1C7mJPFUvsTUKnuQQRIwdWNRFHmzS1A+tHaIUQ21yTpZMbwwLxw93acE0oQEecYbeaQI5zQwNaeMA6henNa1eB0YyeNQU8PSA3iMM2lyglwKBN6J2NbYMfoO181CzJSiYouxoPftYjwCMMmwFfTGSwHMxKBbVuKrrE49327Ahx9yKRCwRH3DPysk4JzXTuFWVioCjZM+XUsTC9XrbaiYQNuZuxxEwXvCDzj1nP8fXb6QmYTCR/dhC22aSpBQ2/lqJ2ZEB54v7sF/79lxeeIhg86EZkBmlkAz5TdcUH8vT5+2epMSYJdKbUrAqHu5TGgDJeacvtoqDs7qKmGCF6WToURL/uXKyaqdeVxNT5xJg/awBykQZsV2Gf51SpaI/KAJjZmmjD9VG4LbvT8C5cnfY6zjiuL94mdcqH4tAw9eylymSAOCDC//YP10CdfTn5HCPxWtS/xs7y9gRStZR0c48u61PsnWwwt8A+BigaeS6aja9OJQ==|920
+}//MA9cRhJyEjAlUEv6lRV6Fdv6GZeprEnMXQdtKDlYUqKN0L36VQmvppeGIWRov2BZgIw/vZeZJMZNhoBttQ7Pn6YvvVBRRKO9hMjPyOrTqDihaVZOVKPKx19RdR0QxNIY7s1jl/glfMj3Tp5EInlb/FEP18ZtKPL6BpmPfuZ1RJPmtm79HYp3AIztbTBHtjTYBXL8639MmoZFGdSVvRl9RTPGSkv0f4wIdTMdFL40Baiy67XexP0IxTclXIaQl9ickxeboUl8j8Ypx+kJz1fHAicnstIjwywXHZ0NGF5HxZvW/5v4BW5A676ZaIcli3Q0S7PyEUZS88BY17+lhfuDYWv+dSEvfxmFG6ctel6mbg4cYyiSR4DkQ0X1ruVq1wrzPPIm/qTL9ugp/R15rlkNtrw25bkVLs02QduddP/o/3b08Ns0j4Peq3ILU/RzYgTU8WTC/OHf7g0ynTiCTpU06nywYuJbl1M14HsnhWSDxvsyM8UE+lr6Y7sF13QUcphQ8ud5s6XPU8ZMv1vb4p4bh5ITeQhZ8pB+zr92q0nMy29wzXT9xIkM074F74wDntXy+FbAAU4SS1/b1vhF3vg4aAIk6rxULjPvekKg6x2L6gNIz4AAXSaDE2b+apuNbwOteUBBgW1AAcMgVfBKNotq3eg6Wo0DPjWCLMqhI9lMtreAl+v0mzUQHMVMNb/oy17z3lJW5VBvqlc+b473Wo4D1w9mtzDnST/Zz2w3z+3I1u+K0fn+oimsp2h5w4np5DJfxhHULExH9QPs7ytz4qY2QiT0p0ossioHowp4JfyS/S1NNUB/UGmdXiolcvdvVPdJlXfIftc9AbjgvV2aqi7FG7V6GrEWc+6F7NPEGqRibbbXJ7ihbbc4tNR9I/X1IRuAi1E8IczhKo/1rHAnFRhNeg==|920

ServerCommands/收益/生成请款单.json

@@ -99,7 +99,7 @@
           },
           "NullFormulaValueQueryPolicy": 0
         },
-        "ID": "0cbf0040eca6470b87adc17a0fe04788",
+        "ID": "0986ee27f8c34ca38643602871d68cdc",
         "BreakpointIdentity": "b6343893-72b8-42f1-8f81-52a7a06d4197"
       },
       {
@@ -135,7 +135,7 @@
                         "$values": [
                           {
                             "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
-                            "GUID": "5cd2fc48-d30f-46d0-833b-12c64e1d3e03",
+                            "GUID": "47f9b1ea-f8cb-4af3-9b61-7ed421656866",
                             "BindingInfo": {
                               "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
                               "TableName": "任务工时表",
@@ -146,14 +146,14 @@
                           },
                           {
                             "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
-                            "GUID": "50da4e08-4f06-4c17-b406-9d84016f0cfb",
+                            "GUID": "d2bb6011-29db-4a0a-a5b0-5ab0f70ae755",
                             "BindingInfo": {
                               "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
                               "TableName": "任务工时表",
-                              "ColumnName": "收益求和",
+                              "ColumnName": "总核定收益",
-                              "GUID": "76131ef4-0310-47ef-b95b-8cae1845c009"
+                              "GUID": "8e29d4ee-5f7f-4497-8c52-12eeabecfa95"
                             },
-                            "ColumnName": "收益求和"
+                            "ColumnName": "总核定收益"
                           }
                         ]
                       },
@@ -191,7 +191,7 @@
                       },
                       "NullFormulaValueQueryPolicy": 0
                     },
-                    "ID": "4c6a056f1ed54f11a37fa30f4d108742",
+                    "ID": "88a50a7fcc38406a8b72a8ff29294e14",
                     "BreakpointIdentity": "34bbe0d9-71af-4a22-9658-f92c70d9d5b7"
                   },
                   {
@@ -235,7 +235,7 @@
                                               "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
                                               "TableName": "收益请款单表",
                                               "ColumnName": "请款日期",
-                                              "GUID": "76452b47-3376-45f0-a050-7c24ad7a1539"
+                                              "GUID": "3e7b90cc-2981-4c4e-86de-4187668cb485"
                                             },
                                             "Value": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -248,7 +248,7 @@
                                               "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
                                               "TableName": "收益请款单表",
                                               "ColumnName": "请款人",
-                                              "GUID": "3c028b50-9026-47ce-af7c-3f84af77e084"
+                                              "GUID": "358edee2-0355-449c-b008-285b5accdfd7"
                                             },
                                             "Value": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -261,11 +261,11 @@
                                               "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
                                               "TableName": "收益请款单表",
                                               "ColumnName": "请款金额",
-                                              "GUID": "11aa2e56-0ae2-4590-b0b0-ef6b3a900449"
+                                              "GUID": "f247c834-bde0-4d8c-94e0-ce867a5113ff"
                                             },
                                             "Value": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                              "SerializeProperty": "=明细统计.收益求和"
+                                              "SerializeProperty": "=明细统计.总核定收益"
                                             }
                                           },
                                           {
@@ -274,7 +274,7 @@
                                               "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
                                               "TableName": "收益请款单表",
                                               "ColumnName": "状态",
-                                              "GUID": "394a4a30-5054-4773-83f2-6abb62983242"
+                                              "GUID": "c0d5ad7d-6359-4fe6-b1c4-bdd374b8e366"
                                             },
                                             "Value": "0"
                                           }
@@ -311,7 +311,7 @@
                                               "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
                                               "TableName": "任务工时表",
                                               "ColumnName": "请款单ID",
-                                              "GUID": "60a3d5cb-60f2-4430-b76d-c52a5910c637"
+                                              "GUID": "a0c5c390-8a28-481c-be64-c53c4822c522"
                                             },
                                             "Value": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -324,7 +324,7 @@
                                               "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
                                               "TableName": "任务工时表",
                                               "ColumnName": "结算状态",
-                                              "GUID": "eb45fbe5-a199-4274-8368-949bbcd828fa"
+                                              "GUID": "93c7c451-9c9c-43b7-a642-cfa025ea36da"
                                             },
                                             "Value": "0"
                                           }
@@ -357,7 +357,7 @@
                               }
                             ]
                           },
-                          "ID": "f03b6740-e680-4acc-9725-1426fb74a7e9"
+                          "ID": "7caa33b2-77ad-43d1-897c-017eaef33057"
                         },
                         {
                           "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -381,7 +381,7 @@
                               }
                             ]
                           },
-                          "ID": "75a1d95a-61b3-4aed-abbd-1efa75aa3319"
+                          "ID": "91a261a0-dd43-46a1-ab2a-41fc5f9285d6"
                         }
                       ]
                     },
@@ -389,7 +389,7 @@
                   }
                 ]
               },
-              "ID": "90c16c12-11f9-491f-902b-2de25c4fdf89"
+              "ID": "bfb6a56e-ed81-4165-8b35-d79ce4e6d796"
             },
             {
               "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -413,7 +413,7 @@
                   }
                 ]
               },
-              "ID": "0e50837f-c87e-4084-876c-107530bc6556"
+              "ID": "4eb7e685-1f10-4c4f-a3ef-c261815940ba"
             }
           ]
         },

Tables/工时/任务工时表.json

@@ -117,7 +117,7 @@
             "执行人": 5,
             "执行内容": 5,
             "提成系数": 5,
-            "收益求和": 5,
+            "核定收益": 5,
             "日期文本": 5,
             "时薪单价": 5,
             "时薪来源": 5,
@@ -125,7 +125,8 @@
             "行数": 5,
             "请款单ID": 5,
             "项目ID": 5,
-            "预算收益": 5
+            "收益求和": 5,
+            "总核定收益": 5
           },
           "subTableOperations": {},
           "dataFilter": {
@@ -153,7 +154,7 @@
             "执行人": 5,
             "执行内容": 5,
             "提成系数": 5,
-            "收益求和": 5,
+            "核定收益": 5,
             "日期文本": 5,
             "时薪单价": 5,
             "时薪来源": 5,
@@ -161,7 +162,8 @@
             "行数": 5,
             "请款单ID": 5,
             "项目ID": 5,
-            "预算收益": 5
+            "收益求和": 5,
+            "总核定收益": 5
           },
           "subTableOperations": {},
           "dataFilter": {
@@ -189,7 +191,7 @@
             "执行人": 5,
             "执行内容": 5,
             "提成系数": 5,
-            "收益求和": 5,
+            "核定收益": 5,
             "日期文本": 5,
             "时薪单价": 5,
             "时薪来源": 5,
@@ -197,7 +199,8 @@
             "行数": 5,
             "请款单ID": 5,
             "项目ID": 5,
-            "预算收益": 5
+            "收益求和": 5,
+            "总核定收益": 5
           },
           "subTableOperations": {},
           "dataFilter": {
@@ -328,12 +331,6 @@
       "Name": "平均时薪",
       "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
-    {
-      "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
-      "Formula": "[时薪单价]*[提成系数]*[工时]",
-      "Name": "预算收益",
-      "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
     {
       "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
       "BindingInfo": {
@@ -346,24 +343,31 @@
       "Name": "行数",
       "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
-    {
-      "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
-      "BindingInfo": {
-        "TableName": "任务工时表",
-        "ColumnName": "预算收益",
-        "GUID": "89bcd620-d57c-4587-a53f-37447e4e2e06"
-      },
-      "AggregateFunction": 4,
-      "DataColumnName": "预算收益",
-      "Name": "收益求和",
-      "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
     {
       "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
       "Formula": "YEAR([工时日期])&\"-\"&MONTH([工时日期])&\"-\"&DAY([工时日期])",
       "Name": "日期文本",
       "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
+    {
+      "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+      "DatabaseColumnType": "float",
+      "MaxLength": -1,
+      "Name": "核定收益",
+      "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
+    {
+      "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
+      "BindingInfo": {
+        "TableName": "任务工时表",
+        "ColumnName": "核定收益",
+        "GUID": "b9530827-1406-487e-84d2-58e59d6be155"
+      },
+      "AggregateFunction": 4,
+      "DataColumnName": "核定收益",
+      "Name": "总核定收益",
+      "ColumnType": "System.Double, 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",

Tables/收益/收益请款单表.json

@@ -298,11 +298,11 @@
       "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
       "BindingInfo": {
         "TableName": "任务工时表",
-        "ColumnName": "预算收益",
+        "ColumnName": "核定收益",
-        "GUID": "b97325e6-4d71-4db8-a6e5-8176279884c3"
+        "GUID": "2901c0d4-c472-41db-bfb2-9c9ce732741e"
       },
       "AggregateFunction": 4,
-      "DataColumnName": "预算收益",
+      "DataColumnName": "核定收益",
       "DetailTableName": "任务工时表",
       "Name": "总收益",
       "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"