diff --git a/.collaboration b/.collaboration index 1c43aeae..4d2ba931 100644 --- a/.collaboration +++ b/.collaboration @@ -2690,53 +2690,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-04T17:42:16.1452115+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin.zip", - "Plugin\\Echarts图表-10_0_102_0(1).zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_102_0.zip", - "Plugin\\JSON数据源-10_0_102_0.zip", - "Plugin\\LottiePlayer.zip", - "Plugin\\Notiflix_Forguncy.zip", - "Plugin\\OPENAIFORGUNCY.zip", - "Plugin\\PC组件包-ElementPlus(超哥优化版)-10_0_104_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_102_0.zip", - "Plugin\\UI操作工具箱-9_0_103_0.zip", - "Plugin\\Unlayer-9_0_103_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0.zip", - "Plugin\\内容编辑器-9_0_103_0.zip", - "Plugin\\加载动画-10_0_102_0.zip", - "Plugin\\发送HTTP请求命令-10_0_102_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_102_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\应用服务器操作工具集合-8_0_3_0.zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_102_0.zip", - "Plugin\\文件操作命令-10_0_102_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\标签页和打开标签命令-10_0_102_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_102_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_102_0.zip", - "Plugin\\设置焦点命令-10_0_102_0(1).zip", - "Plugin\\读取管理控制台日志-10_0_5_0.zip", - "Plugin\\豪~豪插件合集-8_0_103_0(1).zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2792,16 +2746,6 @@ }, { "ModuleName": "PCPage/办理结算审批单-单据信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-07-04T17:40:54.9065493+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\收益\\办理结算审批单\\办理结算审批单-单据信息.json", - "Pages\\收益\\办理结算审批单\\办理结算审批单-单据信息.rd" - ] + "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/收益/办理结算审批单/办理结算审批单-单据信息.json b/Pages/收益/办理结算审批单/办理结算审批单-单据信息.json index 4d8f475d..435eeeb5 100644 --- a/Pages/收益/办理结算审批单/办理结算审批单-单据信息.json +++ b/Pages/收益/办理结算审批单/办理结算审批单-单据信息.json @@ -58,71 +58,98 @@ }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 35.0, + "Mode": 1 } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 24.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 10.0 } }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0 + "DesignLengthInPixel": 32.0 } }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 25.0 + "DesignLengthInPixel": 16.0 } }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 25.0 } }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0 + "DesignLengthInPixel": 35.0 } }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 25.0 + "DesignLengthInPixel": 16.0 } }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 25.0 } }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 16.0 + "DesignLengthInPixel": 35.0 } }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 16.0 } }, "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "24": { "GridRowColumnDefinition": { "DesignLengthInPixel": 100.0, "Mode": 1 } }, - "24": { + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 25.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0, + "Mode": 1 + } + }, + "29": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -135,7 +162,7 @@ } } }, - "Count": 25, + "Count": 30, "DefaultSize": 35.0 }, "Cols": { @@ -256,15 +283,16 @@ "6,9": "开户行", "6,18": "帐号", "9,1": "备注", - "14,1": "付款凭证信息", - "16,1": "付款日期", - "16,18": "付款科目", - "19,1": "实际付款金额", - "22,1": "付款凭证" + "15,1": "付款凭证信息", + "17,1": "付款日期", + "17,18": "付款科目", + "20,1": "实际付款金额", + "23,1": "付款凭证", + "26,1": "备注" }, "Formulas": { - "17,1": "TODAY()", - "20,1": "总金额" + "21,1": "总金额", + "18,1": "TODAY()" }, "AttachInfos": { "4,1": { @@ -526,18 +554,20 @@ }, "10,1": { "BindingInfo": { - "TableName": "付款凭证表", + "TableName": "收益请款单表", "ColumnName": "备注", - "GUID": "10586be8-7293-4b8d-a127-14e2b4518522" + "GUID": "ba5fdf0b-c6ac-46e9-9a24-12f4809687c4" }, "CellType": { "$type": "Forguncy.MultilineTextBox, ServerDesignerCommon", + "BreakLineWithEnter": false, "TemplateKey": "_RS_NewLittleRoundCorner", "WaterMark": "请输入", - "CommandList": [] + "CommandList": [], + "ReadOnly": true } }, - "17,1": { + "18,1": { "BindingInfo": { "TableName": "付款凭证表", "ColumnName": "付款日期", @@ -578,7 +608,7 @@ "IgnoreBlank": false } }, - "17,18": { + "18,18": { "BindingInfo": { "TableName": "付款凭证表", "ColumnName": "付款科目", @@ -628,7 +658,7 @@ "IgnoreBlank": false } }, - "20,1": { + "21,1": { "BindingInfo": { "TableName": "付款凭证表", "ColumnName": "付款金额", @@ -660,7 +690,7 @@ "IgnoreBlank": false } }, - "23,1": { + "24,1": { "BindingInfo": { "TableName": "付款凭证表", "ColumnName": "付款凭证", @@ -693,6 +723,19 @@ "buttonText": "点击上传", "tipText": "只能上传jpg/png文件" } + }, + "27,1": { + "BindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "备注", + "GUID": "e218146c-fa63-40f0-8ddb-7b2c09b1a676" + }, + "CellType": { + "$type": "Forguncy.MultilineTextBox, ServerDesignerCommon", + "TemplateKey": "_RS_NewLittleRoundCorner", + "WaterMark": "请输入", + "CommandList": [] + } } }, "StyleDatas": { @@ -750,6 +793,10 @@ "FontSize": 16.0, "FontWeight": 1 }, + { + "FontFamily": 0, + "FontSize": -1.0 + }, { "Background": 10 } @@ -882,31 +929,6 @@ "10,0": 8, "10,1": 9, "11,0": 8, - "11,1": 9, - "11,2": 9, - "11,3": 9, - "11,4": 9, - "11,5": 9, - "11,6": 9, - "11,7": 9, - "11,8": 9, - "11,9": 9, - "11,10": 9, - "11,11": 9, - "11,12": 9, - "11,13": 9, - "11,14": 9, - "11,15": 9, - "11,16": 9, - "11,17": 9, - "11,18": 9, - "11,19": 9, - "11,20": 9, - "11,21": 9, - "11,22": 9, - "11,23": 9, - "11,24": 9, - "11,25": 9, "12,0": 8, "12,1": 9, "12,2": 9, @@ -933,62 +955,67 @@ "12,23": 9, "12,24": 9, "12,25": 9, - "13,1": 3, - "13,2": 3, - "13,3": 3, - "13,4": 3, - "13,5": 3, - "13,6": 3, - "13,7": 3, - "13,8": 3, - "13,9": 3, - "13,10": 3, - "13,11": 3, - "13,12": 3, - "13,13": 3, - "13,14": 3, - "13,15": 3, - "13,16": 3, - "14,1": 10, + "13,0": 8, + "13,1": 9, + "13,2": 9, + "13,3": 9, + "13,4": 9, + "13,5": 9, + "13,6": 9, + "13,7": 9, + "13,8": 9, + "13,9": 9, + "13,10": 9, + "13,11": 9, + "13,12": 9, + "13,13": 9, + "13,14": 9, + "13,15": 9, + "13,16": 9, + "13,17": 9, + "13,18": 9, + "13,19": 9, + "13,20": 9, + "13,21": 9, + "13,22": 9, + "13,23": 9, + "13,24": 9, + "13,25": 9, + "14,1": 3, + "14,2": 3, + "14,3": 3, + "14,4": 3, + "14,5": 3, + "14,6": 3, + "14,7": 3, + "14,8": 3, + "14,9": 3, + "14,10": 3, + "14,11": 3, + "14,12": 3, + "14,13": 3, + "14,14": 3, + "14,15": 3, + "14,16": 3, "15,1": 10, - "16,1": 6, - "16,2": 3, - "16,3": 3, - "16,4": 3, - "16,5": 3, - "16,6": 3, - "16,7": 3, - "16,8": 3, - "16,9": 3, - "16,10": 3, - "16,11": 3, - "16,12": 3, - "16,13": 3, - "16,14": 3, - "16,15": 3, - "16,16": 3, - "16,18": 2, - "16,19": 3, - "16,20": 3, - "16,21": 3, - "16,22": 3, - "16,23": 3, - "16,24": 3, - "16,25": 3, - "17,1": 7, + "16,1": 10, + "17,1": 6, "17,2": 3, "17,3": 3, "17,4": 3, + "17,5": 3, "17,6": 3, "17,7": 3, "17,8": 3, "17,9": 3, "17,10": 3, "17,11": 3, + "17,12": 3, + "17,13": 3, "17,14": 3, "17,15": 3, "17,16": 3, - "17,18": 7, + "17,18": 2, "17,19": 3, "17,20": 3, "17,21": 3, @@ -996,80 +1023,160 @@ "17,23": 3, "17,24": 3, "17,25": 3, - "19,1": 2, - "19,2": 3, - "19,3": 3, - "19,4": 3, - "19,5": 3, - "19,6": 3, - "19,7": 3, - "19,8": 3, - "19,9": 3, - "19,10": 3, - "19,11": 3, - "19,12": 3, - "19,13": 3, - "19,14": 3, - "19,15": 3, - "19,16": 3, - "20,1": 7, - "21,2": 3, - "21,3": 3, - "21,4": 3, - "21,5": 3, - "21,6": 3, - "21,7": 3, - "21,8": 3, - "21,9": 3, - "21,10": 3, - "21,11": 3, - "21,12": 3, - "21,13": 3, - "21,14": 3, - "21,15": 3, - "21,16": 3, - "22,1": 2, - "23,1": 7, - "23,2": 3, - "23,3": 3, - "23,4": 3, - "23,6": 3, - "23,7": 3, - "23,8": 3, - "23,9": 3, - "23,10": 3, - "23,11": 3, - "23,14": 3, - "23,15": 3, - "23,16": 3, - "23,17": 3, - "23,18": 3, - "23,19": 3, - "23,20": 3, - "23,21": 3, - "23,22": 3, - "23,23": 3, - "23,24": 3, - "23,25": 3, + "18,1": 7, + "18,2": 3, + "18,3": 3, + "18,4": 3, + "18,6": 3, + "18,7": 3, + "18,8": 3, + "18,9": 3, + "18,10": 3, + "18,11": 3, + "18,14": 3, + "18,15": 3, + "18,16": 3, + "18,18": 7, + "18,19": 3, + "18,20": 3, + "18,21": 3, + "18,22": 3, + "18,23": 3, + "18,24": 3, + "18,25": 3, + "20,1": 2, + "20,2": 3, + "20,3": 3, + "20,4": 3, + "20,5": 3, + "20,6": 3, + "20,7": 3, + "20,8": 3, + "20,9": 3, + "20,10": 3, + "20,11": 3, + "20,12": 3, + "20,13": 3, + "20,14": 3, + "20,15": 3, + "20,16": 3, + "21,1": 7, + "22,2": 3, + "22,3": 3, + "22,4": 3, + "22,5": 3, + "22,6": 3, + "22,7": 3, + "22,8": 3, + "22,9": 3, + "22,10": 3, + "22,11": 3, + "22,12": 3, + "22,13": 3, + "22,14": 3, + "22,15": 3, + "22,16": 3, + "23,1": 2, "24,1": 7, - "24,2": 7, - "24,3": 7, - "24,4": 7, - "24,5": 7, - "24,6": 7, - "24,7": 7, - "24,8": 7, - "24,9": 7, - "24,10": 7, - "24,11": 7, - "24,12": 7, - "24,13": 7, - "24,14": 7, - "24,15": 7, - "24,16": 7 + "24,2": 3, + "24,3": 3, + "24,4": 3, + "24,6": 3, + "24,7": 3, + "24,8": 3, + "24,9": 3, + "24,10": 3, + "24,11": 3, + "24,14": 3, + "24,15": 3, + "24,16": 3, + "24,17": 3, + "24,18": 3, + "24,19": 3, + "24,20": 3, + "24,21": 3, + "24,22": 3, + "24,23": 3, + "24,24": 3, + "24,25": 3, + "25,0": 3, + "25,1": 3, + "25,2": 3, + "25,3": 3, + "25,4": 3, + "25,5": 3, + "25,6": 3, + "25,7": 3, + "25,8": 3, + "25,9": 3, + "25,10": 3, + "25,11": 3, + "25,12": 3, + "25,13": 3, + "25,14": 3, + "25,15": 3, + "25,16": 3, + "25,17": 3, + "25,18": 3, + "25,19": 3, + "25,20": 3, + "25,21": 3, + "25,22": 3, + "25,23": 3, + "25,24": 3, + "25,25": 3, + "25,26": 3, + "26,0": 3, + "26,1": 2, + "26,2": 3, + "26,3": 3, + "26,4": 3, + "26,5": 3, + "26,6": 3, + "26,7": 3, + "26,8": 3, + "26,9": 3, + "26,10": 3, + "26,11": 3, + "26,12": 3, + "26,13": 3, + "26,14": 3, + "26,15": 3, + "26,16": 3, + "26,17": 3, + "26,18": 3, + "26,19": 3, + "26,20": 3, + "26,21": 3, + "26,22": 3, + "26,23": 3, + "26,24": 3, + "26,25": 3, + "26,26": 3, + "27,0": 11, + "27,1": 9, + "27,26": 3, + "28,0": 11, + "28,26": 3, + "29,1": 7, + "29,2": 7, + "29,3": 7, + "29,4": 7, + "29,5": 7, + "29,6": 7, + "29,7": 7, + "29,8": 7, + "29,9": 7, + "29,10": 7, + "29,11": 7, + "29,12": 7, + "29,13": 7, + "29,14": 7, + "29,15": 7, + "29,16": 7 }, "RowStyles": { - "12": 11 + "13": 12 }, "SheetStyle": { "FontFamily": 0, @@ -1079,15 +1186,16 @@ "Spans": [ "4,1,1,7", "4,9,1,8", - "10,1,1,25", - "17,1,1,16", - "17,18,1,8", - "20,1,1,25", - "23,1,1,25", + "18,1,1,16", + "18,18,1,8", + "21,1,1,25", + "24,1,1,25", "7,18,1,8", "7,1,1,7", "7,9,1,8", - "4,18,1,8" + "4,18,1,8", + "10,1,2,25", + "27,1,2,25" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1108,7 +1216,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "付款凭证表" + "RelatedDataTableName": "收益请款单表" }, "PrintInfo": { "PaperSize": {}, @@ -1120,4 +1228,4 @@ "Formula": "'办理结算审批单-单据信息'!$S$5" } ] -}//9BXle2Nog+Q8bilSxnEl8TH4FTGzd826hTHX1IOWHawCLvoU/96VrSOsjVcZ+Nlmwmb4okH9WTjPn98Y1WygJnFmFRBXN/H12QWJgeooAUDSpMxenPU9OGlsIiG2qKiRYzSuxJ65dAeD64qAKuHslVtTEI0qGlv4ImbiFy6Vz5SGJyMqg+8CjmGpYHeQvi3Uj3LiTCIUXGZ+o2pUm/WHohLj6alEC1s3Mq++SeMsL3znV1Eb6Bj43vlCmFREo84G4A1dPok19y6xh+O5gF8EzRRa9Inx7sL08+OCNOZpQsJoF6CDiWxlmF26lJsmQsfBMfGU+bKhZUitx0Ti06wCflQeULwxR7Xa6eyecltSc7MsfJnjHjOy8KQ2+4/2ehOR4N1Dfdbl2u6rcPutIRz1pWWNBj5hpN/VuMUlg6uk+hADV/FkJ7UiUBtlIASu+tvkSQ3qr2hoRDJpkrpU5CpwZEQhEAHQyWwXdHF5uU0Uh72jBjZBrWymfVEk0EkiCucmpSKuqsabHXDROzjAYAG5Wg0ZhbeOxa6RkMOkFfS1AGylGLKgZI/G/XTb1Gcm3qW530vm8mBJpRuNVefRISe8B8FJxbhFsMKL+lD5hlGobO+gaKglJ5HPUe+jZxr/oerECvgBU802T3KorEybs+ril/J0idKfrGUiwWP0BZtLsljNa//khQPgqMtCLQpVgmdONuE95eAqkKBgfR1hNKoI1mLeP9xmoUk/9Ed7usRCv77t9sJZvxpH/YRTmrXmm0O/XIyvna5iQmwCCIbXdYF9pn++LUyynDoRdimKXKJtN25raU2MKQkf2mlm5kmfRZ6QGaXwCmx69pnDMoocQABitKQH46JrWNNLgSWLUhuQmgHliuZjDPO0+UFL77R4x6glYhWTIIR6V4iviP/4RDyw9A==|920 \ No newline at end of file +}//7rjMY6l14HTayJfEbw0/IqLvH0xEmuzZG5NnlG8t8HhpmxQq4EhCblZ4SW4bBhcHI5xO5kV5kK9/IKfplt4rRB3wR4CdigXy3NXRNYOh2kx9Oii93TvH2oorlQuOvf1tUzij+CyNhg2nPLWt9SB6Kos3xSTPqQToXKzE5onuL36ZWZoLExXcisMWvjFThRL/wu5SX2yREqymkg2TPgEjKq0t7k5ghpt1NQhafNtAWlrrylr+1UvJjjVurqf4gucxcfAaPsMmnb6cbqwxvYqfuaC/IuHbZwgJRwYCZc/EGdtdJMfPwIqXLulSCV3Ngff7Oynw07u2iinLyyLn+mY8bsuvDiak+aeopdunBpy8AkHMPhqP9aWryd9SpWsCzz4oapN4kSmVjY8vzA077SdKPUNlZKcMe3uNEGBd/SOU4/L9KRF1857Ddr4UfrYfbafxKxU3GI6sTh/b6eC4eiX9504rohkDcOa0IKgP/HovnL/byT+12+QyVTms6nnbGE+XLyHYHCxiMkWB3ZRSCfoNkfTWw3Yqb/gf/4Ky4UIYi/FnpiFExFhKhi94iUF7zQFbi+fzeL4tE0M0pfGmQsV7OnrwbfzSBGeSatiCuDNROF9nD50RSIsX0bijyMC85pBJ/UZE1Qy6FiCaiIBB2PsLuG477UVcOvE9aLfYaJo8rxmGiZHsm1F48Btqw8WhM3PVSrzKsB6ZMKRmWWBFegeB4LdEAcBZByrBUqzZUwScQmsv5vOegbllWHhgwKG4ribQ6mXoTcu8ubU0xb6XPta1oiaLEmn5rfXGv1zL1S1uAAQiGJhbPrLzr+Dva87/YjlZVskuwJiQmUWegCGocvI1TKKoCCwOs9+CLMC1z2gbM6yPsbeUTM5APyrMRdkRRg6T5vw1Q2BvhfZPiRZqoniCgw==|920 \ No newline at end of file diff --git a/Pages/收益/办理结算审批单/办理结算审批单-单据信息.rd b/Pages/收益/办理结算审批单/办理结算审批单-单据信息.rd index 671c96c8..e7045f47 100644 --- a/Pages/收益/办理结算审批单/办理结算审批单-单据信息.rd +++ b/Pages/收益/办理结算审批单/办理结算审批单-单据信息.rd @@ -1,10 +1,10 @@ { "PageType": 0, "ColumnCount": 27, - "RowCount": 25, + "RowCount": 30, "Formulas": { - "17,1": "TODAY()", - "20,1": "总金额" + "21,1": "总金额", + "18,1": "TODAY()" }, "CustomNames": [ { diff --git a/Plugin/对象与集合操作工具-8_0_0_0(1).zip b/Plugin/对象与集合操作工具-8_0_0_0.zip similarity index 55% rename from Plugin/对象与集合操作工具-8_0_0_0(1).zip rename to Plugin/对象与集合操作工具-8_0_0_0.zip index a5cade08..aff19558 100644 Binary files a/Plugin/对象与集合操作工具-8_0_0_0(1).zip and b/Plugin/对象与集合操作工具-8_0_0_0.zip differ