diff --git a/.collaboration b/.collaboration index cce1c0ce..b99c2267 100644 --- a/.collaboration +++ b/.collaboration @@ -5,137 +5,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.1798427+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.1798552+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.1798568+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.1798578+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.1798596+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.1798613+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.1798621+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.1798604+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.179864+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -260,16 +170,7 @@ }, { "ModuleName": "Table/需求反馈登记表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:46:19.8354239+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\需求反馈\\需求反馈登记表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/反馈类型表", @@ -401,47 +302,17 @@ }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.1799191+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_商品表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.179922+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单明细表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.1799244+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -622,17 +493,7 @@ }, { "ModuleName": "Table/message_test", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:45:07.1799322+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\message_test.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -829,17 +690,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:54:33.8004744+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -987,17 +838,7 @@ }, { "ModuleName": "PCPage/处理反馈工单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:39:56.2117704+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\处理反馈工单.json", - "Pages\\项目\\项目反馈\\处理反馈工单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目任务分组详情", @@ -1965,42 +1806,15 @@ }, { "ModuleName": "ServerCommand/修改工时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:54:33.8005325+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\修改工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/删除任务成员所有工时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:59:39.5900266+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\删除任务成员所有工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/上报实际工时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:54:33.800086+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\上报实际工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/TODO", @@ -2876,54 +2690,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T15:04:13.7059203+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.zip", - "Plugin\\嵌入自定义HTML页面-8_0_102_0.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", @@ -2955,16 +2722,7 @@ }, { "ModuleName": "ServerCommand/删除指定工时记录", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-08-20T14:58:31.1601343+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\删除指定工时记录.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/重算指定报工收益", diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index a5e66176..d0db5a52 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/Pages/项目/项目反馈/处理反馈工单.json b/Pages/项目/项目反馈/处理反馈工单.json index 7d423f44..9541d12e 100644 --- a/Pages/项目/项目反馈/处理反馈工单.json +++ b/Pages/项目/项目反馈/处理反馈工单.json @@ -71,6 +71,11 @@ "DesignLengthInPixel": 32.0 } }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 375.0 + } + }, "17": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 @@ -90,11 +95,6 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } - }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 375.0 - } } }, "InLogicalVisibleIndexes": [ @@ -248,6 +248,7 @@ "9,10": "所属项目", "9,19": "关联任务", "12,1": "预计处理工时", + "12,15": "一键报工", "12,19": "下一节点处理人", "13,1": 1, "15,1": "解决方案", @@ -680,6 +681,245 @@ "clearable": true } }, + "12,15": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "ID", + "GUID": "9c5d011a-2109-4da7-8c5b-b9721a206fff" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!T11" + } + }, + "BreakpointIdentity": "857fe874-e5a6-4c26-88ba-6f87ac097d00" + }, + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "f7a9426e-ff4d-46af-98d0-30d9c3f9b23b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!T11" + } + }, + "BreakpointIdentity": "67b3f07d-e574-4b4d-82c2-75f65e1e0136" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "成员数量", + "GUID": "39483242-1939-4644-8e97-91abbcc537a0" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "任务成员", + "GUID": "1a3c3f2a-ae70-4e6b-9b90-72ab7f243551" + } + }, + "value": "%CurrentUser%", + "compareType": 10 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "任务状态", + "GUID": "924d8abe-8744-40f3-973c-b0230075aba3" + } + }, + "value": "2" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "新增报工", + "PassValues": [ + { + "Source": "实际", + "TargetCell": { + "SerializeProperty": "=新增报工!工时类型" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!T11" + }, + "TargetCell": { + "SerializeProperty": "=新增报工!任务ID" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!B14" + }, + "TargetCell": { + "SerializeProperty": "=新增报工!工时数" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!B17" + }, + "TargetCell": { + "SerializeProperty": "=新增报工!工作进展" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理反馈工单!ID" + }, + "TargetCell": { + "SerializeProperty": "=新增报工!反馈ID" + } + } + ], + "LoadBindingDataOption": 1, + "BreakpointIdentity": "dd5dfb56-1609-477a-b42e-d791b31f86de" + } + ], + "ID": "baacf6f7-bebc-469e-a12a-35dd5c57acc0" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"当前任务处于\"&处理反馈工单!行数据.状态&\"状态，不可报工！\"" + }, + "BreakpointIdentity": "1947013d-c6db-4bdb-8bbc-1527194baef5" + } + ], + "ID": "e54bc261-640d-4e25-9853-37dec8c967c2" + } + ], + "BreakpointIdentity": "85f560e9-2bb8-43fb-8745-53cf07517a5e" + } + ], + "ID": "65a144bd-2fee-4fb3-9cca-4da5bd41a460" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "你尚未成为该任务参与人，不能报工", + "BreakpointIdentity": "038456c4-8274-4b66-ac61-d1fedc537548" + } + ], + "ID": "06250e50-2111-4317-900d-d5954de52b36" + } + ], + "BreakpointIdentity": "b2ab54a1-2128-4135-8168-91be2f0de957" + } + ], + "ID": "32072b41-cd8b-4cf2-89a2-5ec18c91c2ca" + }, + { + "CommandList": [ + { + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": "该任务尚未添加成员，是否立即添加？", + "Type": "warning", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "按钮结果", + "AdvancedSettings": {}, + "BreakpointIdentity": "8eae2d89-3b69-4ca2-9380-f10a25b4d0c7" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=处理反馈工单!按钮结果" + } + ] + }, + "value": "confirm" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "参与成员管理", + "LoadBindingDataOption": 1, + "BreakpointIdentity": "7cc7974d-b682-41fa-bf89-81749c6ef02f" + } + ], + "ID": "16450902-3ad2-4710-8d31-8558a069d7c3" + } + ], + "BreakpointIdentity": "4bfd9b52-39e7-4bcc-bd53-bdbe019890ba" + } + ], + "ID": "a51402a8-dc0b-462a-9c6b-8319c9a3157d" + } + ], + "BreakpointIdentity": "45417697-5dd4-4f98-8b7a-04f0f962c66c" + } + ], + "Text": "一键报工", + "ClickMode": 1, + "IsDisabled": true, + "TemplateKey": "_RS_Main" + }, + "RulesGuidList": [ + "df8ec9d4-7cbe-4e2c-b793-280088ac654d" + ] + }, "13,1": { "BindingInfo": { "TableName": "需求反馈登记表", @@ -798,10 +1038,11 @@ "GUID": "290559ec-abba-41e4-9867-6fa6fc262035" }, "CellType": { - "$type": "TinyRichEditor.TinyRichEditorCellType, TinyRichEditor", + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { - "Scope": 4, + "Scope": 2, "AllowRoles": [ "FGC_Anonymous" ] @@ -811,11 +1052,17 @@ "AllowRoles": [ "FGC_Anonymous" ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] } ], - "ShowMenuBars": false, - "ShowToolBars": false, - "WaterMark": "请描述解决方案" + "type": "textarea", + "placeholder": "请输入", + "resize": "none" } }, "16,19": { @@ -944,7 +1191,7 @@ "BreakpointIdentity": "a4127f7c-5cf9-4377-8e0c-26165974d6d6" } ], - "ID": "f8a1c121-cc72-47e7-b4d5-2d9f857acd51" + "ID": "d89a3ab5-9ffb-4b4c-ac69-b76a60f38a0f" }, { "CommandList": [ @@ -960,7 +1207,7 @@ "BreakpointIdentity": "63407a1b-5292-49be-9606-7ad4aec87c35" } ], - "ID": "f1b4fb02-a4d8-4170-9cd7-30ea73b2778c" + "ID": "b47cce98-8f7c-4095-9571-d21544342b90" } ], "BreakpointIdentity": "e3dada0e-65b9-450d-b4f6-c0c182f1c426" @@ -1162,7 +1409,7 @@ "BreakpointIdentity": "58ed15dd-c248-4b95-beaa-7e2c1a00fb94" } ], - "ID": "46b03f6d-b961-43a1-b7c2-707d4097d66c" + "ID": "c86c5554-ebb3-40e6-a44b-a5ec31d86633" } ], "BreakpointIdentity": "ee097a72-7523-4a1a-aad5-05397331cfb1" @@ -1209,6 +1456,13 @@ "ColumnName": "状态", "GUID": "e36d0800-87af-474f-a6b5-71e1d101362c" } + }, + "20,27": { + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "报工ID", + "GUID": "c8023185-32ab-49b5-92f2-3d6725e104c6" + } } }, "StyleDatas": { @@ -1257,7 +1511,13 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 7, + "HorizontalAlignment": 7, + "Underline": false + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 8, "Formatter": 3 }, { @@ -1267,7 +1527,7 @@ "Formatter": 3 }, { - "Formatter": 8 + "Formatter": 9 }, { "FontSize": 13.333333333333332 @@ -1282,6 +1542,7 @@ "black", "Left", "yyyy/m/d h:mm", + "Right", "Accent 1 0", "@" ] @@ -1547,9 +1808,7 @@ "12,12": 7, "12,13": 7, "12,14": 7, - "12,15": 7, - "12,16": 7, - "12,17": 7, + "12,15": 9, "12,18": 2, "12,19": 5, "12,20": 2, @@ -1615,7 +1874,7 @@ "14,36": 7, "14,38": 2, "15,0": 2, - "15,1": 9, + "15,1": 10, "15,2": 7, "15,3": 7, "15,4": 7, @@ -1633,7 +1892,7 @@ "15,16": 7, "15,17": 7, "15,18": 2, - "15,19": 10, + "15,19": 11, "15,20": 7, "15,21": 7, "15,22": 7, @@ -1687,28 +1946,28 @@ "20,4": 0, "20,5": 0, "20,6": 0, - "20,11": 11, + "20,11": 12, "20,17": 2, "20,18": 2, "20,19": 2 }, "RowStyles": { - "5": 12, - "6": 12, - "7": 12, - "8": 12, - "9": 12, - "10": 12, - "11": 12, - "12": 12, - "13": 12, - "14": 12, - "15": 12, - "16": 12, - "17": 12, - "18": 12, - "19": 12, - "20": 12 + "5": 13, + "6": 13, + "7": 13, + "8": 13, + "9": 13, + "10": 13, + "11": 13, + "12": 13, + "13": 13, + "14": 13, + "15": 13, + "16": 13, + "17": 13, + "18": 13, + "19": 13, + "20": 13 }, "SheetStyle": { "FontFamily": 0 @@ -1737,10 +1996,12 @@ "13,1,1,17", "13,19,1,17", "10,19,1,17", - "16,1,1,17", "16,19,1,17", "18,19,1,6", - "18,12,1,6" + "18,12,1,6", + "12,15,1,3", + "16,1,1,17", + "20,27,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1790,7 +2051,7 @@ "BreakpointIdentity": "4892ef7f-fb2d-41ad-90e5-aad95880f3bc" } ], - "ID": "9c0de12c-dbab-40f2-a458-6fe0d651bb3f" + "ID": "0cf834d1-1246-4c7c-a004-8e0f654ef850" } ], "BreakpointIdentity": "b9c1557b-fde8-4a51-aeaf-b87bbfd66cf2" @@ -1815,6 +2076,20 @@ "RelatedDataTableName": "需求反馈登记表", "ConditionFormatRulesCollection": { "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=AND(处理反馈工单!状态>1,处理反馈工单!报工ID=\"\")" + }, + "Priority": 1, + "GUID": "df8ec9d4-7cbe-4e2c-b793-280088ac654d", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsInvisible": false + }, { "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { @@ -1853,6 +2128,10 @@ { "Name": "状态", "Formula": "处理反馈工单!$Y$21" + }, + { + "Name": "报工ID", + "Formula": "处理反馈工单!$AB$21" } ] -}//iKZP4tZEcXWzV5X4FdTR4KP4yYXqKZoXwRGo4Qp5kwSukQ5+pYV1sLedtSuwk08N3u/TG/JOi+jJrA4NKt7rVDS5TkytqljIB4hKD5+/C/etUltFikoF/p84s/nLvh1k3mMXjbRKjIlT08gkoHOQnsUn2Kb13GfN9nwKgzlnpaRIAI8HC8N/e0WwC++xyUFrzE3lkdrUNCwGip3seSZM7+ZrC5YYSqzryxLmUFXb8bM0OUSACw8hI3ecyAyOyOp4v+QtNtIj8oFvdBcXDb5fCmxzvoN12mdronQI5Jn4u6NpB4RLDTWnUOXrmAnVsghbjuCoguGdwr7S58tqcdYOjybX6rm9OpTC9CNQV572/Ifj1K+iFHVGmLmQMdac8Mq+pcjUx4X5Qcc4YUBNkGeD5Ah107UaHrXwpEXJbM7AOAtWy8tJIkD7VNrLyUJwKovVwgNpVgIZzkMIG9d7E8bw4HWJaCJPhRo44Smxoo/WMeZTPF6T6AOnVKbK617Vim1F8wsLw+m3FgaXeWl44/8765xGHbwQJ/h6YlTEfNzSRjTO6wkMPx0ZTzSxnlcvoz3q+aZy+mZf2Z2EuL4e9vm3vRjat+O8dsXKa6aOqv+GUSrRkFRyUe1KQ4ORPnaAaJzanxtz6Q8GcTi1QdnmjAPWuQK+IdCtmQKVzGZUURlv0ZsdOwdE1KwlYEynbZnGaJy+gqHwz7yjLMMpgCg0Vxo6s5PTvt5u0u2Gt2A10jWMMZS8SXrK3/AhICjwa+1JsY3499Gq/p+7GiKc1RV7I6QMcxQfk9ITwtd2Dzdnjo9IIrVzY4K+Z9cjyZmYn95XVWKeCokyXiAc3DLjOfWj6KOSc5eLJUHw8DIT7JSJNjygInu/KvT1QOTZsLi1jwhWOhv5oNC9pUuq6WcKSLPXh5bbbg==|920 \ No newline at end of file +}//mnA7QbcvA9SAngV5y67ANI81cpl+ObadboHEOU2l2kei3tvyvaZ70wqnmjqdKIzhKoC+5pHByIqo49R2wTN79ztzLm2D9xQAu4nlaKMxm6stXfsLQ65Gql7RVazgh9VaCIXKPMzijoUYZRBVt+830swMWVYWe06jl6hru3Mz11p5smPVWhFep9YaLSVkGdhjFrVeSswjGq2jPQz6qd+Z+h+0OtrW4JUDoiIKuYmFnPga5G7JMevqdJwkCvJkMhv3JhzzYl9rEysb78HQIJHqkfvHbaOJJxv0Bbu0pZTqwhYWZmfJ8OwPsgllxPi/NM/KznLOteqeFslC3VWAcCJeEFVqz39kNS5IkE4e2mJFHMIK5MHFZJHEEzv94lKaeTnhVCkpcLe4/WiCO92raJfxVk55PxbAnttO5Dnh1cLC5Q/krRRIZzgGzWp5ny6W80r9EItVYSpNQdnl9gGYSjMeeTHbCFfdZF4fRJp4gHPihdAsj1EE4ANhxOYte9/g8XuVFoDeeRXjPgB17E3Rbrsz6gJsLG25XkTyhHpNofW/eZSiKwFtaoVUS4rtpgAlie21pBY7MInAaWlYgw8fy6DzKDQQ2Rl1Qn1S219FVBGdX+hDfQTTxrQLPHcjX8KAqVNOZikml+n6A8UySNIRDECV2woOF9DJKkr8GIotyEjc1bWwQigEM8b4VVp0XICSGZDN/1F3fYStjyCGbzxWaitIu4DyJvoevQuLjj/EnQ5XeX+70D0WtxsOXfyRMLN+JHyUoH9g0Zfug4oKuhm0sgPeayCgwCNVL4RrCtL6u61l30QhgulNuw45GwTvauAwGqNwOi9fhG5kL93hEQtaSgGEnymswsMxb1WuW7fu8wLiMphKIoMsSw4s7PXXCt8n9PbUXy8M8oLP3Qia1nVVFVRg/g==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/处理反馈工单.rd b/Pages/项目/项目反馈/处理反馈工单.rd index 16b10d1c..25df00ed 100644 --- a/Pages/项目/项目反馈/处理反馈工单.rd +++ b/Pages/项目/项目反馈/处理反馈工单.rd @@ -23,6 +23,10 @@ { "Name": "状态", "Formula": "处理反馈工单!$Y$21" + }, + { + "Name": "报工ID", + "Formula": "处理反馈工单!$AB$21" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json index b44472c5..466c575a 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json @@ -580,7 +580,7 @@ "BreakpointIdentity": "288ae14e-7ae8-4471-a9d8-d1117ba04e93" } ], - "ID": "8236c7e0-2a45-48cd-a3bd-24d47eac9783" + "ID": "66c07432-aa82-449b-a07b-fb28d21e10c6" } ], "BreakpointIdentity": "7f14170f-5452-40d1-ac31-92b4ec16a0ee" @@ -639,7 +639,7 @@ ] } ], - "min": "0.1", + "min": "0", "max": "99999", "step": 1, "precision": 1, @@ -763,7 +763,7 @@ "BreakpointIdentity": "5a93ac16-d8bb-4810-99ca-aba9158ae768" } ], - "ID": "c65cb42e-fa1d-43b2-9e6d-039f8ba4649d" + "ID": "18da5af4-06c8-4d8c-b7a6-04bdd99895ed" }, { "CommandList": [ @@ -907,7 +907,7 @@ "BreakpointIdentity": "f0c63aab-624f-4261-8c4a-bb5297b965e0" } ], - "ID": "fdefd35b-f753-485d-ae97-89bb96741cb6" + "ID": "cd0b0996-0675-4337-9eff-09e42b60e914" }, { "CommandList": [ @@ -921,7 +921,7 @@ "BreakpointIdentity": "b39da01c-4746-4b70-9f96-566c899c52c0" } ], - "ID": "8ab945fe-3507-420a-b76e-2a918ebde48a" + "ID": "cd442673-fe4f-4dd7-8a08-54742115acf9" } ], "BreakpointIdentity": "892e92c7-7bd0-41c2-9a8a-b79f74c2a848" @@ -937,13 +937,13 @@ "BreakpointIdentity": "45e1ac21-fa09-49b0-8f04-8e0f37b47cdd" } ], - "ID": "b12f756c-2d8c-4111-9143-7a4022529f4b" + "ID": "95c428b3-f3fd-49d1-9959-28435a869e1e" } ], "BreakpointIdentity": "0a4bc035-9eb0-4273-b7dc-8f8abc84129c" } ], - "ID": "f19c8a21-b2b9-41c9-a418-e4636da92e25" + "ID": "c2837079-8c7a-4c09-a094-25bf6f62e9ca" }, { "Condition": { @@ -1121,7 +1121,7 @@ "BreakpointIdentity": "bc782bdf-defb-4114-8feb-9acc88997380" } ], - "ID": "faca4de3-a3c3-4091-824e-0a261a4b5708" + "ID": "4b5aba92-ec5f-41d6-a88f-aeaede7cbd9c" }, { "CommandList": [ @@ -1131,13 +1131,13 @@ "BreakpointIdentity": "7336e69c-fccf-4984-b772-6f90bf0c2ac9" } ], - "ID": "d253550e-1c63-4cd2-884f-7c12cfe4baa0" + "ID": "86d5dc44-1271-49a4-9fb3-e127f98a38ae" } ], "BreakpointIdentity": "ae9024a5-a15f-4fdd-aa20-843a2fb33efa" } ], - "ID": "7ae6a359-2796-420d-b1ff-9193255fdd53" + "ID": "7b28b7ef-49b3-49bf-93a3-06990db1f136" } ], "BreakpointIdentity": "2067e7f3-4a3c-443d-bb29-4717d6cc34a0" @@ -1193,13 +1193,13 @@ "BreakpointIdentity": "507b7a54-bc30-4b84-abee-fd163cd856ba" } ], - "ID": "dac66405-5722-4ae6-ba27-29cf3fa359ba" + "ID": "986ece36-a5ca-4e55-aaf8-39733384d6d1" } ], "BreakpointIdentity": "372608e7-4d70-481f-8afe-902ca1d1f546" } ], - "ID": "c278bb11-1265-49f9-9ed5-9215b6a564c9" + "ID": "781a63d9-d638-4716-aa8a-946db07507ee" } ], "BreakpointIdentity": "4bc6b6dc-b3c8-4ec9-9283-2bdf729ff1c2" @@ -1503,6 +1503,14 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=新增报工!B19" } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "反馈ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!反馈ID" + } } ], "ResultErrorCodeTo": { @@ -1543,7 +1551,7 @@ "BreakpointIdentity": "9a5ead74-4e20-4bf5-88b4-bea61d050a2d" } ], - "ID": "f75bcd68-278d-461e-b323-74fd2232828e" + "ID": "1cf90cac-7e16-42b0-b9e6-90689aaa7590" }, { "CommandList": [ @@ -1559,13 +1567,13 @@ "BreakpointIdentity": "3697b31d-8759-4a2a-8b3f-fa4aacc0e369" } ], - "ID": "d694637c-a9b5-4f91-a1ee-665ce4095a9c" + "ID": "3169f97d-5df5-48cf-a401-dec150ecd19c" } ], "BreakpointIdentity": "438a3a0d-f98e-418d-9a29-a59df3fd4510" } ], - "ID": "99e59abd-9e36-4813-a853-4670925a33ea" + "ID": "4f111d6a-cc0b-4e17-85c7-fe51cfb56187" } ], "BreakpointIdentity": "40cf13ed-3c5a-49f3-925c-f3203401639c" @@ -1653,7 +1661,7 @@ "BreakpointIdentity": "6c2551be-d3f1-407a-aa58-1ddfe5f912de" } ], - "ID": "dbe36397-1e32-4dcd-908b-5569f4b7711c" + "ID": "a52de498-61ce-4301-8dc2-011ade1c26c9" }, { "CommandList": [ @@ -1669,7 +1677,7 @@ "BreakpointIdentity": "542f964e-2ad1-41f2-b904-dae10b780399" } ], - "ID": "b6ed453a-46b0-4260-922e-2cdfcf9da35b" + "ID": "e976a69c-64d7-4452-a68b-f091290183f5" } ], "BreakpointIdentity": "414200cd-0974-4b5d-a707-c9c9b91ceeea" @@ -2061,7 +2069,8 @@ "31,1,1,3", "2,1,1,17", "29,1,1,4", - "30,8,1,3" + "30,8,1,3", + "31,4,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2128,7 +2137,7 @@ "BreakpointIdentity": "5f419cb3-3648-4bd9-9b11-04d5c09db727" } ], - "ID": "70c619b4-1053-4a17-8c8e-80e1cd3718ac" + "ID": "3e9c3309-0328-4efa-b1b3-a33261d9b4a6" }, { "CommandList": [ @@ -2146,7 +2155,7 @@ "BreakpointIdentity": "bdc7ba4a-7ff5-4c48-a983-1394685a4bce" } ], - "ID": "e54ebe2b-710f-46fe-aeaf-ded91b875675" + "ID": "31bdf377-b397-451d-bdf2-56b75185921b" } ], "BreakpointIdentity": "b1871849-00b3-4090-a8fe-67a8292b2f59" @@ -2221,6 +2230,10 @@ { "Name": "项目经理", "Formula": "新增报工!$I$31" + }, + { + "Name": "反馈ID", + "Formula": "新增报工!$E$32" } ] -}//WwJCEcdSxoIsIludDS7nfIleJoHK0GFN8t0uIwLdjA7E9Ve3xq1xGefQunVdI8pPvPN9slNcUnpfetNux1B5TZt8GCizmqH7bWq+FPS3iNHDs6S6eODWK0SSPqM0CuZmNnJV3tKHM8HbNGxJfuQn1pW0x31kSK3mqHvcatHyrzRdEq1XBsQTwVKOp5/l/KgZbbauMt2J53eO3a8TX8DstGuh7URn+9/vy8yqUsNc26QPJv5VUWqd5N4OIo6HISXjCmmXJ3wNXlhns9RY2wEmK4BOliGQP6CnSa9VaJGKm+tn5W1OCxwO382nS8NUPmIbPvRWbgr0Bb/M8sDMlpPbfFZfnh/U959RYxrh5SOgx+ZZOoC54Xz6yZ7p2brzQI1141bq7/l2RAGl+XyVzWUrHAcAmyTq7shyRz6RUig6oMWrTAQq0QcFD5f11AEzHqy5h9cKRrSoixNO9x0FB7D6BOtGjjSuwkUBvNdeVXap82X3A9o2Gnrraavn6E4hCw1PL2jp9pEnHlbTPzqZRySY7eHgMPdx3F1j7BI03q1HQfaV/Htccs8v47gHF8DoQS9TN6onV3w5PUmjJeLogqwH3+IU76y1AHBIX4oYOdjIBkHORzJ6Wzdu2usQoo5lt8SS4jIQ0c/b3vfsuUh/Xu7MKBGrssgXWc1bz+Cfoe9ssWQy2ziJyDQTPFqdh4gZPWtrKBnrrnXA28uOhi9x9a9emtNa1GbvthS5YZhvyDR0eFbzfsiubL0e7/NTxHBq6CNzb4A/KEaU9pRNNzjegj4GdczM3Og/xS2VpU7KWsbynob9L5o8F0x2PVLPg+gzsdmNIDEbBT1Xs/PpR+fHtw2fs0lgGzlB2/9e6gQRFsUW0iB1bLrY+IuGMwm7jT1CrvbdnUAu5c8uyO6A0PLjG+RVGg==|920 \ No newline at end of file +}//7n/1IY/lBmKsQIFYGhW+YIKwurTUVDo5tEmsSRpGgeuB77rdBMvnit6MlkMzBarGg1EKDbT0cY7BknUjbPQx8qnNG+DeCKGyPwKcRDMrxi2kHS+Oye/YaOYYFkHycRdZmJZ2EKAM6o3gMxIu7y/2RYNu9YKd1Bhfqol9jXt2sswRlW9XbmI/KdNyff6zLTxS0K0OkOYNgnaQyKV6D1Fqz71qlTfs1u+0aGbUXOqXp1Mbfm45Co8ANjw99KEVVqoytMst1/ytdKdPKT0L5CtdjFYWLFH8GdG5IsThysO0MHendUN6gd2a5gDaaSEh+5HfgEwhF/6ZvlG1o2OxRVZtR3dOGiigNSVwM+iAykL7yKn0ez3aDlO5ul7NiO+E17uLC1OookzZLHcBE3/6aATZtcb+n0MuT+9PwfnEv9W+C7gW/sGq43Eggu0XFTkQZjK4Um02F0CcTx1fL64Nnu9dg7UTCg/O3KTWF9oE3/Fl3uQ+YTi8GguEdIx1gPSInBioLZRl84WMfrs9nRfeqm4LKSAeaFbeSsQ4QMRYTHd379k2ozaMTrNGBUuHstELtixvuhCR4hxQnefYgvv72MzzZJjutv4ivBbc8/wzVNaC2gXv8xpJcYRISOxkFs+dKnKvcoNPZvZ0ih1BztHrXXkNp3tmmshFErdzGkB+cBS8mdPggMaxNIG8Gcylc30n3ZXNHpgRfABtSFCpehhJjCOBRyLx44egT9V8eqvSR4L5ZDn7DYiKPN547sDkSwSic/EcVjWhH2XonP39coVYescw/s3hUYMidgas1DLQ4nlz7aSj07gAPOrKaL6deqJqUKWWgCzRLjY8F6xBsSVDDiUvMwJ2dCO6ghmhepR7o7AGrCgWb0j4YRa2HWGMn+OFj/Nqq8w7fFufygFQAu2MAbMUAg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd index e5fcc626..e0c288e4 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd @@ -49,6 +49,10 @@ { "Name": "项目经理", "Formula": "新增报工!$I$31" + }, + { + "Name": "反馈ID", + "Formula": "新增报工!$E$32" } ] } \ No newline at end of file diff --git a/Plugin/对象与集合操作工具-8_0_0_0(1).zip b/Plugin/对象与集合操作工具-8_0_0_0(1).zip new file mode 100644 index 00000000..e1e1b54e Binary files /dev/null and b/Plugin/对象与集合操作工具-8_0_0_0(1).zip differ diff --git a/Plugin/对象与集合操作工具-8_0_0_0.zip b/Plugin/对象与集合操作工具-8_0_0_0.zip deleted file mode 100644 index aff19558..00000000 Binary files a/Plugin/对象与集合操作工具-8_0_0_0.zip and /dev/null differ diff --git a/ServerCommands/工时/上报实际工时.json b/ServerCommands/工时/上报实际工时.json index 411636c3..a18229c5 100644 --- a/ServerCommands/工时/上报实际工时.json +++ b/ServerCommands/工时/上报实际工时.json @@ -92,6 +92,13 @@ "DataValidationInfo": { "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon" } + }, + { + "$type": "Forguncy.SaveLoad.PostRequestParameterSaveData, ServerDesignerCommon", + "Name": "反馈ID", + "DataValidationInfo": { + "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon" + } } ] }, @@ -577,7 +584,7 @@ } ] }, - "ID": "721450a5-44d6-4939-b77e-bfa07c0bf5e2" + "ID": "a4ddff2d-8a88-4bba-bfd2-e205f05b3ec3" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -606,7 +613,7 @@ } ] }, - "ID": "130368f1-9320-4e15-b194-dde06afbb8a8" + "ID": "75e8260d-aaa2-401b-8ac4-4c57d4d2c35f" } ] }, @@ -710,7 +717,7 @@ ] }, "Comments": "如果是分配到天，就检测当前日期该人员在任务里的计划工时是否够用", - "ID": "1680d29d-b9f5-4e07-8849-4d239a64a471" + "ID": "381b7c6e-530e-447b-acf3-e2bbff377a0d" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -729,7 +736,7 @@ } ] }, - "ID": "16aaa595-62c8-48ba-baf9-98487c33a420" + "ID": "bd929bb5-aa9c-4e2e-94ed-5d372a857544" } ] }, @@ -738,7 +745,7 @@ ] }, "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，", - "ID": "4f33bbd7-0d67-4352-a272-20c6efb9743c" + "ID": "3b7af60e-3f3c-4a2e-9e24-aca495c84ba7" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -757,7 +764,7 @@ } ] }, - "ID": "315300bb-a80d-46d1-b882-818b3fb2445b" + "ID": "abb78b5a-1cbc-457e-bb75-839eda1051d9" } ] }, @@ -871,7 +878,7 @@ } ] }, - "ID": "e0de5ec2-1b74-454f-85d7-7e9f8b21d360" + "ID": "8bc59293-d85b-426b-abcd-35cbfd74a881" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -886,7 +893,7 @@ } ] }, - "ID": "476f86a3-c904-4a4c-814a-0d1c5fa0ca71" + "ID": "8287b194-27c6-41bd-acfc-c5b7029412c5" } ] }, @@ -911,7 +918,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "b724680f-776e-4e54-91a2-c9297e4bedcd" + "GUID": "f2ce327d-b71e-4029-afcc-c3376200c5e9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -924,7 +931,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "7adeae26-15d9-4e7a-b8a3-2f8be012540b" + "GUID": "361d433f-6757-4b60-8f34-f89c455aeb9f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -937,7 +944,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "2dd639be-112f-42c8-a352-e565512a5187" + "GUID": "7c7e48c2-c493-44ad-a2cf-d626ebcf794c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -950,7 +957,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "9e61b98c-6940-40d8-b4a1-e5af68294e70" + "GUID": "bb1ac03e-259e-45a7-a268-48c55ee45c98" }, "Value": "实际" }, @@ -960,7 +967,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "64719746-55a7-4b74-b6e3-a07b5998d005" + "GUID": "b1354227-4f44-46ce-85ee-bc248c5e4d38" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -973,7 +980,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "e95185d4-dcba-46ca-8e3d-2787fe91b3dc" + "GUID": "9694bd2f-8357-405d-9a8c-de3368e88709" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -986,7 +993,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "125448ba-e749-4137-a64f-3e4c18cc11a9" + "GUID": "a9e983d2-1305-4488-9ef8-17461e687360" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -999,7 +1006,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "上报工时", - "GUID": "11939523-4632-48d8-a827-2b178bed5f60" + "GUID": "6dd3fa4f-32e4-4f08-bfbe-bc5683c9a204" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1012,7 +1019,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "79a41e14-30fc-4903-bdc2-e81252ae3f51" + "GUID": "57bebfb3-b0f5-4ad6-ad29-78f3fa25e1a2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1025,7 +1032,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "提成系数", - "GUID": "f7029413-87fa-4cdd-87d4-67773b9ac600" + "GUID": "68219797-7c08-4a0b-872c-92174d8dbd4a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1038,7 +1045,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "时薪来源", - "GUID": "8e577bf2-9f96-49d1-9e6a-50f0d2ac3882" + "GUID": "466f6a09-e91c-4396-9f15-e64a31464546" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1047,8 +1054,80 @@ } ] }, + "ParamNameToSaveNewRowValue": "新任务", "BreakpointIdentity": "ca30ebc1-a684-4d51-818b-8b69d266a3f4" }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=反馈ID" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "需求反馈登记表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "需求反馈登记表", + "ColumnName": "ID", + "GUID": "89e3d55b-abd8-42bf-9db2-f602a925532f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=反馈ID" + } + }, + "UpdateBindingValues": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "需求反馈登记表", + "ColumnName": "报工ID", + "GUID": "faae7dbb-6dd9-40a5-a08a-3a0e56522fb2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新任务.ID" + } + } + ] + }, + "ParamNameToSaveNewRowValue": "新任务", + "Comments": "新增加的字段，用于记录该上报工时包含哪些反馈", + "BreakpointIdentity": "f892cb54-5726-4986-a908-b1d7bb41d291" + } + ] + }, + "ID": "cac95eb6-aa8d-46d9-95bd-681cd3b68e5d" + } + ] + }, + "BreakpointIdentity": "b9b49e48-9dd8-402f-b3dd-1c6522af0b70" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": { @@ -1104,7 +1183,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "cae2c58a-e0a4-4ebd-a9de-f8f20b234768" + "GUID": "e676d48d-baf3-450b-9f05-c11c539a31ad" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1117,7 +1196,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "04dacea9-1c73-4eef-a5ab-4f90d1dee383" + "GUID": "e48079a0-55bd-4328-9be3-c95572ff7708" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1130,7 +1209,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "37c13de2-4404-4ea8-9c6a-cd4fed18e2b1" + "GUID": "5191eccf-01ca-4749-a3de-2edcc340260e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1143,7 +1222,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "fd8fd7be-9be0-4d45-b4f3-76778e8b2e60" + "GUID": "f692b8f7-0bc5-40d2-ac32-eb581d65fc60" }, "Value": "计划" }, @@ -1153,7 +1232,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "d1f053d3-3835-4bf3-98cc-c5e94300cd35" + "GUID": "fb22c50d-23ef-463c-871a-412473c4e0a1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1166,7 +1245,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "bcb2e10f-0798-48f8-a95e-7787ce15cfb1" + "GUID": "3ca98b27-9ec6-40db-aea2-9240500a20bd" }, "Value": "系统自动生成对应计划，保证任务可分配工时" }, @@ -1176,7 +1255,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "3646e75b-cdcc-4166-9fdd-9dca98aa9101" + "GUID": "112e6f82-23fd-464b-a8d3-33f09bf987cc" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1189,7 +1268,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "上报工时", - "GUID": "f166c286-6753-489a-b204-7ac19c5394c3" + "GUID": "aab359de-b796-4a43-a77c-f7f8dd6a5ac4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1202,7 +1281,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "94941dbf-8f4c-4081-896b-6ebf68b70c25" + "GUID": "0740a118-999e-43e6-b6a0-cbb732be606f" }, "Value": "0" }, @@ -1212,7 +1291,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "提成系数", - "GUID": "26bd30ab-af9a-45a4-8f4d-8bfc7e71618b" + "GUID": "02fde094-9a0b-4430-a20a-7ad70c99a06e" }, "Value": "0" }, @@ -1222,7 +1301,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", "ColumnName": "时薪来源", - "GUID": "b16bb597-1aff-47aa-a254-92d2e1eeefa7" + "GUID": "6781d0f8-4c8e-4297-aa19-86767fe8bd28" } } ] @@ -1233,7 +1312,7 @@ ] }, "Comments": "如果是分配到任务，就补一条计划，保证任务可分配工时准确", - "ID": "51b7a57f-5aae-4c5d-befd-27c1788bb835" + "ID": "40f996f0-2cc2-40ef-9543-1049438f7155" } ] }, @@ -1266,7 +1345,7 @@ } ] }, - "ID": "1f055839-6800-40a3-9b07-1cc8f809c090" + "ID": "a31755e6-32a0-4375-880b-e2dd7f9ca06d" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -1284,7 +1363,7 @@ } ] }, - "ID": "0c8becbd-a115-487a-876e-765405444041" + "ID": "e6c97ce8-3d45-413b-9f6b-a72bfd233f47" } ] }, @@ -1308,7 +1387,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "ad77fcdf-55a6-477e-9d6a-7197107ac13a" + "GUID": "c9c79730-b19e-4136-89f1-ba5b5830cb79" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1321,7 +1400,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "6c60d59f-b4d1-4918-b6ad-5528e53cd560" + "GUID": "ed887615-8287-4b3c-aa60-014a23388c34" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1334,7 +1413,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "26304b92-3427-4848-8c0b-a175c88fbf43" + "GUID": "2f91b750-3770-4d78-a24a-97ad19983e5a" }, "Value": "%CurrentUser%" }, @@ -1344,7 +1423,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目动态", "ColumnName": "类型", - "GUID": "d0f88789-880e-43d3-919d-89e10c8bf5bf" + "GUID": "7f659f4b-aabd-408e-a580-0537817bddf3" }, "Value": "5" } @@ -1364,7 +1443,7 @@ } ] }, - "ID": "9088538e-66f1-4f01-995e-b50e2b7dc141" + "ID": "f9c6be1e-aa8e-435a-bdf3-19917483aa78" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -1385,7 +1464,7 @@ } ] }, - "ID": "0002fd2c-98a5-4b35-8c77-85ab46006722" + "ID": "29d3fc07-9605-4dd5-8f12-4b7c70c6c9f2" } ] }, @@ -1393,7 +1472,7 @@ } ] }, - "ID": "b038839f-630c-4567-a700-fd3f8e4d2d8e" + "ID": "82138c56-d633-4ca5-a1bd-e8a9ea6cc376" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -1411,7 +1490,7 @@ } ] }, - "ID": "b29e2137-beda-431e-b5de-de8721dfe66f" + "ID": "2c5c55a7-0c89-4413-9375-668bb50cb4db" } ] }, @@ -1443,5 +1522,9 @@ "BreakpointIdentity": "03ba8cee-4e2d-4f80-a934-cad34ee0c0ac" } ] + }, + "ReturnProperties": { + "$type": "System.Collections.Generic.List`1[[Forguncy.SaveLoad.ReturnPropertySaveData, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [] } } \ No newline at end of file diff --git a/ServerCommands/工时/修改工时.json b/ServerCommands/工时/修改工时.json index 201742d2..8c00e077 100644 --- a/ServerCommands/工时/修改工时.json +++ b/ServerCommands/工时/修改工时.json @@ -309,6 +309,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=报工信息.时薪单价" } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "反馈ID" } ] }, @@ -326,7 +330,7 @@ } ] }, - "ID": "a12d0a98-073e-48cf-a7a5-396f39df8483" + "ID": "2e6b2237-4825-4b4a-9d08-d181d729d881" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -403,7 +407,7 @@ } ] }, - "ID": "c39a6b8e-7ed8-4423-a231-78e6aa5458ec" + "ID": "012d0123-795c-4afb-bfbf-3348b80b5afe" } ] }, diff --git a/ServerCommands/工时/删除任务成员所有工时.json b/ServerCommands/工时/删除任务成员所有工时.json index 57761d4b..a2afdeb5 100644 --- a/ServerCommands/工时/删除任务成员所有工时.json +++ b/ServerCommands/工时/删除任务成员所有工时.json @@ -56,94 +56,157 @@ "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务工时表", - "UpdateType": "delete", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": { - "$type": "System.Collections.Generic.List`1[[ForguncyDataAccess.ISqlCondition, ForguncyDataAccess]], System.Private.CoreLib", + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "要删除的任务工时", + "TableValue": { + "$type": "Forguncy.Model.Commands.ParameterTableValue, ServerDesignerCommon", + "TableName": "任务工时表", + "BindingInfos": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon]], System.Private.CoreLib", "$values": [ { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { + "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", + "GUID": "d9e04f82-64ed-493b-b9c3-1490b8f04141", + "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", - "ColumnName": "任务ID", - "GUID": "a1f40291-8adf-4f2d-b2dd-a0163f820016" + "ColumnName": "ID", + "GUID": "3b924e49-61c0-474b-8002-635df03043f4" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "5103a89d-5ee6-47e8-a46c-1cf0ac4bd453" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行人" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "任务工时表", - "ColumnName": "结算状态", - "GUID": "dd4d38ae-2abc-4e45-aa16-c0a5786fee05" - }, - "Value": "0" - }, - { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": { - "$type": "System.Collections.Generic.List`1[[ForguncyDataAccess.ISqlCondition, ForguncyDataAccess]], System.Private.CoreLib", - "$values": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "任务工时表", - "ColumnName": "请款单ID", - "GUID": "3d48c5d7-1cc3-4c26-9fc1-3471b883eb6b" - }, - "Value": "%Null%", - "LeftBracket": 1 - }, - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 8, - "ColumnBindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "任务工时表", - "ColumnName": "请款单ID", - "GUID": "b3a24aac-8f6c-4acf-8c1e-d8fd74540dfd", - "RelationBinding": { - "$type": "ForguncyDataAccess.RelationBinding, ForguncyDataAccess", - "RelatedTable": "收益请款单表", - "RelatedColumn": "ID", - "DisplayColumn": "状态" - } - }, - "Value": "0,4", - "RightBracket": 1 - } - ] - }, - "RelationType": 1 + "ColumnName": "ID" } ] + }, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": { + "$type": "System.Collections.Generic.List`1[[ForguncyDataAccess.ISqlCondition, ForguncyDataAccess]], System.Private.CoreLib", + "$values": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "44db7459-9494-4d42-b503-d8c75405ae34" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "23b28e1f-c441-4bb3-998c-cfdc92f186b5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务工时表", + "ColumnName": "结算状态", + "GUID": "c22d5e76-cacd-4243-99d0-4ba1c786a6e3" + }, + "Value": "0" + }, + { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": { + "$type": "System.Collections.Generic.List`1[[ForguncyDataAccess.ISqlCondition, ForguncyDataAccess]], System.Private.CoreLib", + "$values": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务工时表", + "ColumnName": "请款单ID", + "GUID": "8f4efff8-20fc-44e0-be44-77bdf8157d43" + }, + "Value": "%Null%", + "LeftBracket": 1 + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务工时表", + "ColumnName": "请款单ID", + "GUID": "88566371-68eb-4771-87a3-cf9e4244fca0", + "RelationBinding": { + "$type": "ForguncyDataAccess.RelationBinding, ForguncyDataAccess", + "RelatedTable": "收益请款单表", + "RelatedColumn": "ID", + "DisplayColumn": "状态" + } + }, + "Value": "0,4", + "RightBracket": 1 + } + ] + }, + "RelationType": 1 + } + ] + } } }, - "BreakpointIdentity": "154877c9-7b8a-493a-b96e-7033f15af20c" + "ID": "e71dc37b7a54483aa4ffd5bdc5a81fb3", + "BreakpointIdentity": "4a8393ca-2d76-4dcf-8011-066b0a1c12be" + }, + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=要删除的任务工时" + }, + "LoopItemParamName": "Item" + }, + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "删除指定工时记录", + "Parameters": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.RequestServerCommandParamBase, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "报工记录ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.ID" + } + } + ] + }, + "ResultErrorCodeTo": { + "$type": "Forguncy.Common.FormulaCellLocation, ServerDesignerCommon", + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "$type": "Forguncy.Common.FormulaCellLocation, ServerDesignerCommon", + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true, + "BreakpointIdentity": "c459ffb1-6a34-4685-9759-7866325b3ad8" + } + ] + }, + "BreakpointIdentity": "2f2849b4-8ef8-4037-8d1d-406caf86abb8" }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", diff --git a/ServerCommands/工时/删除指定工时记录.json b/ServerCommands/工时/删除指定工时记录.json index 4afd157d..f7f3945e 100644 --- a/ServerCommands/工时/删除指定工时记录.json +++ b/ServerCommands/工时/删除指定工时记录.json @@ -61,7 +61,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "8cb2d082-9177-4961-b9f0-4f74fe93ae21", + "GUID": "d7ec21d4-e4a2-4def-a015-e47f673ff558", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", @@ -72,7 +72,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "4dbdb3c8-735e-4f36-96a4-99e46cb18a10", + "GUID": "7061dcde-4657-4936-82b0-17dcd9e2cefc", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", @@ -105,7 +105,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "64833fdb10c6450387ee29f839fbc214", + "ID": "a8083a039dff4e0eacd145439ef2ca77", "BreakpointIdentity": "7c6e2f4f-a916-425d-a0f0-5b6ff2c86a57" }, { @@ -182,7 +182,7 @@ } ] }, - "ID": "b717d9d3-09d6-431b-8198-2f4fa0c958c1" + "ID": "596c7ebf-a04a-4ffd-bce0-72cd3367f98b" } ] }, @@ -190,32 +190,76 @@ } ] }, - "ID": "9c3c92ab-3178-4094-8fb9-ce219643c6e0" + "ID": "c7152a25-ffa0-475a-8f45-a85951d2a646" } ] }, "BreakpointIdentity": "16fd8378-9979-4601-ba3d-f81d7d760a07" }, { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务工时表", - "UpdateType": "delete", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "任务工时表", - "ColumnName": "ID", - "GUID": "c931e430-8dc5-4272-977d-030a1c5f1931" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=报工记录ID" - } + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "UpdateType": "delete", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "任务工时表", + "ColumnName": "ID", + "GUID": "c931e430-8dc5-4272-977d-030a1c5f1931" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=报工记录ID" + } + }, + "BreakpointIdentity": "52daf510-166a-498f-ad29-92bd298a4fd0" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "需求反馈登记表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "需求反馈登记表", + "ColumnName": "报工ID", + "GUID": "1a13db22-7940-491c-ac20-b765677f8baa" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=报工记录ID" + } + }, + "UpdateBindingValues": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "需求反馈登记表", + "ColumnName": "报工ID", + "GUID": "716980ab-9be4-41de-979f-9822e0e55b97" + }, + "Value": "%Null%" + } + ] + }, + "BreakpointIdentity": "0fa7547e-d582-45ff-927a-98b8876f5f8a" + } + ] }, - "BreakpointIdentity": "3ca3ebcf-6629-4295-bfb0-6f8e0bdd203c" + "BreakpointIdentity": "3d93050b-c073-4a32-a1db-f0c3e1db9c90" }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -225,7 +269,7 @@ } ] }, - "ID": "058fd8d4-9d99-46a8-bb29-b1638b5ee6aa" + "ID": "92565ec5-d045-496e-b2c4-adec0c406c0b" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -240,7 +284,7 @@ } ] }, - "ID": "f3b8d30e-8823-4b0c-82a9-0242f9869b61" + "ID": "4a760aff-1614-49be-90cf-33283b06e9af" } ] }, diff --git a/Tables/需求反馈/需求反馈登记表.json b/Tables/需求反馈/需求反馈登记表.json index 36b49f46..592a394b 100644 --- a/Tables/需求反馈/需求反馈登记表.json +++ b/Tables/需求反馈/需求反馈登记表.json @@ -168,6 +168,13 @@ "Name": "处理用时", "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "报工ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "BindingInfo": { @@ -252,6 +259,13 @@ "ForeignTable": "需求反馈登记表", "ForeignColumn": "发布记录ID", "IsDetailTableRelation": true + }, + { + "PrimaryTable": "任务工时表", + "PrimaryColumn": "ID", + "ForeignTable": "需求反馈登记表", + "ForeignColumn": "报工ID", + "IsDetailTableRelation": true } ], "Indexes": []