From 06f51da9b920341763e4ca8929c4de66fed318f1 Mon Sep 17 00:00:00 2001 From: "SHAMUSPC\\NINGMEI" Date: Fri, 19 Apr 2024 20:17:37 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1.=20=E5=AE=8C=E5=96=84=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=96=B0=E5=A2=9E=E3=80=81=E5=8F=98=E6=9B=B4=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E9=A2=84=E7=AE=97=E5=B7=A5=E6=97=B6=E6=A0=B8=E9=AA=8C?= =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E5=AD=90=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=81=9A=E5=87=BA=E5=88=A4=E6=96=AD=EF=BC=9B\r\n2.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B1=87=E6=8A=A5=E6=97=B6=E7=9A=84=E5=A1=AB=E6=8A=A5?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?ID=EF=BC=8C=E7=94=B1=E5=90=8E=E7=AB=AF=E7=94=9F=E6=88=90?= =?UTF-8?q?=EF=BC=9B","MessageType":2,"Modules":[{"State":1,"Type":1,"Name?= =?UTF-8?q?":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=9F=BA=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF"},{"State":1,"Type":1,"Name":"PCPage/=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1-=E5=AD=90=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8"},{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E6=96=B0=E5=A2=9E=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1"},{"State":1,"Type":1,"Name":"PCPage/=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8A=A5=E5=B7=A5"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E6=B1=87=E6=8A=A5=E8=AF=A6=E6=83=85"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E5=AF=BC=E5=85=A5=E6=B1=87=E6=8A=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE"},{"State":1,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E9=A2=84=E7=AE=97=E5=B7=A5?= =?UTF-8?q?=E6=97=B6"},{"State":1,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E9=A6=96=E9=A1=B5"},{"State":3,"Type":23,"Name":"Ta?= =?UTF-8?q?bleView/=E9=A1=B9=E7=9B=AE=E4=BB=BB=E5=8A=A1=E6=A0=91=E8=A7=86?= =?UTF-8?q?=E5=9B=BE"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 118 +--- Pages/484d3ed119274a60bf32f15d178cf60.json | 759 +++++++++------------ Pages/484d3ed119274a60bf32f15d178cf60.rd | 2 +- Pages/任务/任务-基本信息.json | 42 +- Pages/任务/任务-基本信息.rd | 16 + Pages/任务/任务-子任务列表.json | 80 ++- Pages/任务/工时/新增报工.json | 40 +- Pages/任务/新增任务.json | 63 +- Pages/任务/新增任务.rd | 8 +- Pages/汇报/导入汇报数据.json | 91 +-- Pages/汇报/导入汇报数据.rd | 2 +- Pages/汇报/汇报详情.json | 39 +- Pages/首页/首页.json | 38 +- ServerCommands/任务/修改任务预算工时.json | 473 +++++++------ ServerCommands/任务/新增任务.json | 684 +++++++++---------- Tables/项目/项目任务树视图.json | 51 ++ 16 files changed, 1242 insertions(+), 1264 deletions(-) create mode 100644 Tables/项目/项目任务树视图.json diff --git a/.collaboration b/.collaboration index 4b091d3a..953f2231 100644 --- a/.collaboration +++ b/.collaboration @@ -621,17 +621,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-19T19:59:44.4928751+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -643,19 +633,7 @@ }, { "ModuleName": "PCPage/任务-子任务列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-19T20:00:47.5694294+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-子任务列表.json", - "Pages\\任务\\任务-子任务列表.rd", - "Pages\\558ca610fafc4ffd8884b819161bfd6.json", - "Pages\\558ca610fafc4ffd8884b819161bfd6.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-工时", @@ -675,17 +653,7 @@ }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-19T19:56:06.7027976+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json", - "Pages\\任务\\新增任务.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增进展", @@ -709,17 +677,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-19T20:02:13.2208182+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -787,19 +745,7 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-19T19:34:48.2452046+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报详情.json", - "Pages\\汇报\\汇报详情.rd", - "Pages\\484d3ed119274a60bf32f15d178cf60.json", - "Pages\\484d3ed119274a60bf32f15d178cf60.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情预览", @@ -807,17 +753,7 @@ }, { "ModuleName": "PCPage/导入汇报数据", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-19T19:38:53.8612006+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\导入汇报数据.json", - "Pages\\汇报\\导入汇报数据.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/工时", @@ -933,29 +869,11 @@ }, { "ModuleName": "ServerCommand/修改任务预算工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-19T20:12:22.0620871+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\修改任务预算工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-19T20:04:29.9325318+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\新增任务.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/移除任务成员", @@ -1548,19 +1466,7 @@ }, { "ModuleName": "PCPage/首页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-19T19:41:37.7448811+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\首页\\首页.json", - "Pages\\首页\\首页.rd", - "Pages\\2d17eefef7c5473fbc54f0c5820a6c1.json", - "Pages\\2d17eefef7c5473fbc54f0c5820a6c1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/对话页面", @@ -1605,12 +1511,6 @@ }, { "ModuleName": "TableView/项目任务树视图", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-19T19:34:19.2568329+08:00", "ModuleType": 23 } ] \ No newline at end of file diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.json b/Pages/484d3ed119274a60bf32f15d178cf60.json index c349cf5f..ddf5b64f 100644 --- a/Pages/484d3ed119274a60bf32f15d178cf60.json +++ b/Pages/484d3ed119274a60bf32f15d178cf60.json @@ -19,7 +19,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 16.0 } }, "4": { @@ -29,38 +29,33 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0, - "Mode": 1 + "DesignLengthInPixel": 16.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 16.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 32.0 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 30.0, + "Mode": 1 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "12": { @@ -68,12 +63,7 @@ "DesignLengthInPixel": 15.0 } }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "15": { + "13": { "GridRowColumnDefinition": { "DesignLengthInPixel": 34.0, "IsHidden": true @@ -82,9 +72,9 @@ }, "InLogicalVisibleIndexes": [ 1, - 15 + 13 ], - "Count": 16, + "Count": 14, "DefaultSize": 32.0 }, "Cols": { @@ -181,28 +171,24 @@ "DefaultSize": 32.0 }, "Values": { - "2,1": "类型", - "2,2": "*", - "2,5": "日报", - "2,9": "*日报指的是昨日的工作总结，计划为今日工作安排", - "4,1": "内容", + "2,1": "关联任务", + "4,1": "类型", "4,2": "*", - "7,1": "工时", - "7,2": "*", - "7,5": 1, - "9,1": "关联项目", - "11,1": "关联任务", - "13,1": "删除此行", - "13,15": "添加一行" + "4,5": "日报", + "4,9": "*日报指的是昨日的工作总结，计划为今日工作安排", + "6,1": "工时", + "6,2": "*", + "6,5": 1, + "8,1": "内容", + "8,2": "*", + "11,1": "删除此行", + "11,15": "添加一行" }, "AttachInfos": { "1,1": { "CssName": "ec-label", "TemplateCellSource": "内容概要" }, - "1,12": { - "TemplateCellSource": "工时" - }, "1,16": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", @@ -241,7 +227,7 @@ "ShowConfirm": false } ], - "ID": "df12acbb-b2ef-409a-8f3b-b4fe4ab5ed31" + "ID": "2021be82-0ca6-4fd6-837a-5bf82943db43" } ] } @@ -269,7 +255,7 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!3:14" + "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!3:12" }, "Value": true } @@ -283,216 +269,6 @@ } }, "2,5": { - "CellType": { - "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 1, - "CellDefaultValue": "日报", - "Items": [ - { - "Value": "日报", - "DisplayValue": "日报" - }, - { - "Value": "计划", - "DisplayValue": "计划" - } - ] - }, - "DataValidationInfo": { - "IgnoreBlank": false - }, - "TemplateCellSource": "汇报类型" - }, - "2,17": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!2:2" - }, - "Value": true - }, - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!3:14" - }, - "Value": false - } - ] - } - ], - "ToolTip": "收起", - "Size": 18, - "ImagePath": "收起2.svg", - "UseCellForeColor": true - } - }, - "4,5": { - "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "textarea", - "placeholder": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF('484d3ed119274a60bf32f15d178cf60'!F3=\"日报\",\"填写你昨日的工作汇报\",\"填写你今日的工作计划\")" - }, - "resize": "vertical" - }, - "DataValidationInfo": { - "IgnoreBlank": false - }, - "TemplateCellSource": "汇报内容" - }, - "7,5": { - "CellType": { - "$type": "ElementUI.InputNumberCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "DefaultValue": 1, - "min": "0.1", - "max": "24", - "step": 1, - "placeholder": "单位：小时", - "controlsPosition": true - }, - "DataValidationInfo": { - "NumberType": 2, - "FirstParamValue": "0", - "SecondParamValue": "24", - "IgnoreBlank": false - }, - "TemplateCellSource": "工时" - }, - "9,5": { - "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!F12" - }, - "Value": "%Null%" - } - ] - } - ], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "useBinding": true, - "options": [ - { - "value": "黄金糕", - "label": "黄金糕" - }, - { - "value": "双皮奶", - "label": "双皮奶" - }, - { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "项目表", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "9d0b11df-cc99-4722-9361-433d38b32e37" - }, - "ColumnName": "value" - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目名称", - "GUID": "9db7a57f-961c-43cd-9960-d6420d67d0ae" - }, - "ColumnName": "label" - } - ], - "CustomColumns": [] - }, - "placeholder": "请选择", - "noDataText": "无数据", - "collapseTags": true, - "filterable": true, - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据", - "clearable": true - }, - "TemplateCellSource": "关联项目" - }, - "11,5": { "CellType": { "$type": "ElementUI.CascaderCellType, ElementUI", "CommandList": [], @@ -776,73 +552,176 @@ ], "bindingOptions": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "任务表", + "TableName": "项目任务树视图", "BindingInfos": [ { "BindingInfo": { - "TableName": "任务表", + "TableName": "项目任务树视图", "ColumnName": "ID", - "GUID": "cc6eb785-25fe-4c14-9648-7c6b780a5ec9" + "GUID": "43fa61ab-494c-492b-8557-8e2116fdb816" }, "ColumnName": "value" }, { "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务名称", - "GUID": "9710ea07-f598-4027-ae5d-eb7531720af8" + "TableName": "项目任务树视图", + "ColumnName": "名称", + "GUID": "af74fd3a-306a-41f0-a051-345d6b57c823" }, "ColumnName": "label" }, { "BindingInfo": { - "TableName": "任务表", - "ColumnName": "父任务ID", - "GUID": "5ea11473-b2e0-4e5e-9d84-63a0138613bd" + "TableName": "项目任务树视图", + "ColumnName": "PID", + "GUID": "0d61dc8c-1870-4019-9776-281f610d4147" }, "ColumnName": "parentValue" } ], - "SqlCondition": { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 8, - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "453a0357-1913-4669-865f-1ef273dd6fbf" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!F10" - } + "CacheSetting": { + "AllowCache": true, + "ExpiredTime": 60 }, - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "FGC_CreateDate", - "GUID": "ebc3271e-c991-4001-8f41-a44c459855d8" - }, - "Order": 1 - } - ] + "TreeSourceSetting": { + "IdColumn": "value", + "PidColumn": "parentValue", + "QueryResultMode": 2 }, "CustomColumns": [] }, "placeholder": "请选择", "separator": "/", "tagType": "info", - "checkStrictly": true, "filterable": true, "clearable": true }, - "TemplateCellSource": "关联任务", - "RulesGuidList": [ - "89c4449b-a2c6-4ae3-91a8-b412927bddf3" - ] + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TemplateCellSource": "关联任务" }, - "13,1": { + "4,5": { + "CellType": { + "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", + "Style": 1, + "CellDefaultValue": "日报", + "Items": [ + { + "Value": "日报", + "DisplayValue": "日报" + }, + { + "Value": "计划", + "DisplayValue": "计划" + } + ] + }, + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TemplateCellSource": "汇报类型" + }, + "4,17": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!2:2" + }, + "Value": true + }, + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!3:12" + }, + "Value": false + } + ] + } + ], + "ToolTip": "收起", + "Size": 18, + "ImagePath": "收起2.svg", + "UseCellForeColor": true + } + }, + "6,5": { + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": 1, + "min": "0.1", + "max": "24", + "step": 1, + "placeholder": "单位：小时", + "controlsPosition": true + }, + "DataValidationInfo": { + "NumberType": 2, + "FirstParamValue": "0", + "SecondParamValue": "24", + "IgnoreBlank": false + }, + "TemplateCellSource": "工时" + }, + "8,5": { + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "textarea", + "placeholder": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF('484d3ed119274a60bf32f15d178cf60'!F5=\"日报\",\"填写你昨日的工作汇报\",\"填写你今日的工作计划\")" + }, + "resize": "vertical" + }, + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TemplateCellSource": "汇报内容" + }, + "11,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -880,7 +759,7 @@ "ShowConfirm": false } ], - "ID": "c387f35a-d701-41b6-8ca8-c0085dcbbdff" + "ID": "a72b0750-1496-48f8-be6c-ed5587edddc0" } ] } @@ -896,7 +775,7 @@ "IconSize": 14.0 } }, - "13,15": { + "11,15": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -904,7 +783,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!R3" + "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!R5" }, "TargetType": "Forguncy.ImageCellType, ServerDesignerCommon, Version=10.0.1.0, Culture=neutral, PublicKeyToken=967100671921c115", "MethodName": "ExecuteCommand" @@ -930,7 +809,7 @@ "IconSize": 14.0 } }, - "15,1": { + "13,1": { "CellType": { "$type": "Forguncy.TextCellType, ServerDesignerCommon", "SavedValidators": [ @@ -950,7 +829,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!B16" + "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!B14" } ] }, @@ -967,7 +846,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "0bd8e80d-a842-4d10-a4dd-22509ad7feea" + "ID": "a3551648-e601-4616-8ac6-353c3ce3ae5e" }, { "CommandList": [ @@ -975,13 +854,13 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!R3" + "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!R5" }, "TargetType": "Forguncy.ImageCellType, ServerDesignerCommon, Version=10.0.1.0, Culture=neutral, PublicKeyToken=967100671921c115", "MethodName": "ExecuteCommand" } ], - "ID": "8824caac-3853-493d-9db1-2a856bea09b2" + "ID": "39764aef-cb8a-4109-972f-6b876e1c6a4e" } ] } @@ -999,23 +878,35 @@ { "FontFamily": 1, "FontSize": 13.333333333333332, - "Foreground": 0, - "Formatter": 2, - "HorizontalAlignment": 3 + "Foreground": 2, + "Formatter": 3, + "HorizontalAlignment": 4 }, { "FontFamily": 1, "FontSize": 13.333333333333332, - "Foreground": 4, + "Foreground": 0, + "HorizontalAlignment": 4 + }, + { + "FontFamily": 1 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Formatter": 3 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 0, "Formatter": 5, "HorizontalAlignment": 6 }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Foreground": 0, - "HorizontalAlignment": 6 - }, { "FontSize": 13.333333333333332 }, @@ -1024,36 +915,24 @@ "FontSize": 13.333333333333332, "Foreground": 7 }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332 - }, { "FontFamily": 1, "FontSize": 12.0, "Foreground": 8 }, - { - "FontFamily": 1 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Formatter": 5 - }, { "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 9, - "Formatter": 5, - "HorizontalAlignment": 6 + "Formatter": 3, + "HorizontalAlignment": 4 }, { "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 10, - "Formatter": 5, - "HorizontalAlignment": 6 + "Formatter": 3, + "HorizontalAlignment": 4 }, { "Formatter": 11 @@ -1063,11 +942,11 @@ "Strs": [ "Text 1 50", "Body", - "0.0\"小时\"", - "Right", "Accent 5 0", "[AUTO]General", "Center", + "0.0\"小时\"", + "Right", "#FFFF0000", "Background 2 -10", "Accent 4 0", @@ -1077,125 +956,159 @@ }, "CellStyles": { "1,1": 0, - "1,12": 1, - "1,16": 2, - "1,17": 3, + "1,16": 1, + "1,17": 2, + "2,0": 3, "2,1": 4, - "2,2": 5, - "2,5": 6, - "2,9": 7, - "2,10": 8, - "2,11": 8, - "2,12": 8, - "2,13": 8, - "2,14": 8, - "2,15": 8, + "2,2": 3, + "2,3": 3, + "2,4": 3, + "2,5": 5, + "2,6": 3, + "2,7": 3, + "2,8": 3, + "2,9": 3, + "2,10": 3, + "2,11": 3, + "2,12": 3, + "2,13": 3, + "2,14": 3, + "2,15": 3, + "2,16": 3, "2,17": 3, - "4,1": 9, - "4,2": 5, - "4,3": 8, - "4,5": 6, - "7,1": 9, - "7,2": 5, - "7,3": 8, - "7,5": 4, - "9,0": 8, - "9,1": 9, - "9,2": 8, - "9,3": 8, - "9,4": 8, - "9,5": 6, - "9,18": 8, - "11,0": 8, - "11,1": 9, - "11,2": 8, - "11,3": 8, - "11,4": 8, - "11,5": 6, - "11,18": 8, - "12,0": 8, - "12,1": 9, - "12,2": 9, - "12,3": 9, - "12,4": 8, - "12,5": 6, - "12,6": 6, - "12,7": 6, - "12,8": 6, - "12,9": 6, - "12,10": 6, - "12,11": 6, - "12,12": 6, - "12,13": 6, - "12,14": 6, - "12,15": 6, - "12,16": 6, - "12,17": 6, - "12,18": 8, - "13,0": 8, - "13,1": 10, - "13,2": 8, - "13,3": 8, - "13,14": 10, - "13,15": 11, - "13,16": 8, - "13,17": 8, - "13,18": 8, - "14,0": 8, - "14,1": 10, - "14,2": 10, - "14,3": 10, - "14,15": 11, - "14,16": 11, - "14,17": 11, - "14,18": 8, - "15,1": 12, - "15,5": 12 + "2,18": 3, + "3,1": 0, + "3,2": 0, + "3,3": 0, + "3,4": 0, + "3,5": 0, + "3,6": 0, + "3,7": 0, + "3,8": 0, + "3,9": 0, + "3,10": 0, + "3,12": 6, + "3,13": 6, + "3,14": 6, + "3,16": 1, + "3,17": 2, + "4,1": 7, + "4,2": 8, + "4,5": 5, + "4,9": 9, + "4,10": 3, + "4,11": 3, + "4,12": 3, + "4,13": 3, + "4,14": 3, + "4,15": 3, + "4,17": 2, + "6,0": 3, + "6,1": 4, + "6,2": 8, + "6,3": 3, + "6,4": 3, + "6,5": 5, + "6,6": 3, + "6,7": 3, + "6,8": 3, + "6,9": 3, + "6,10": 3, + "6,11": 3, + "6,12": 3, + "6,13": 3, + "6,14": 3, + "6,15": 3, + "6,16": 3, + "6,17": 3, + "6,18": 3, + "7,0": 3, + "7,1": 3, + "7,2": 3, + "7,3": 3, + "7,4": 3, + "7,5": 3, + "7,6": 3, + "7,7": 3, + "7,8": 3, + "7,9": 3, + "7,10": 3, + "7,11": 3, + "7,12": 3, + "7,13": 3, + "7,14": 3, + "7,15": 3, + "7,16": 3, + "7,17": 3, + "7,18": 3, + "8,1": 4, + "8,2": 8, + "8,3": 3, + "8,5": 5, + "10,0": 3, + "10,1": 4, + "10,2": 4, + "10,3": 4, + "10,4": 3, + "10,5": 5, + "10,6": 5, + "10,7": 5, + "10,8": 5, + "10,9": 5, + "10,10": 5, + "10,11": 5, + "10,12": 5, + "10,13": 5, + "10,14": 5, + "10,15": 5, + "10,16": 5, + "10,17": 5, + "10,18": 3, + "11,0": 3, + "11,1": 10, + "11,2": 3, + "11,3": 3, + "11,14": 10, + "11,15": 11, + "11,16": 3, + "11,17": 3, + "11,18": 3, + "12,0": 3, + "12,1": 10, + "12,2": 10, + "12,3": 10, + "12,15": 11, + "12,16": 11, + "12,17": 11, + "12,18": 3, + "13,1": 12, + "13,5": 12 }, "SheetStyle": { "FontFamily": 1 } }, "Spans": [ - "4,5,2,13", - "7,5,1,13", + "8,5,2,13", "11,1,1,3", - "11,5,1,13", - "9,1,1,3", - "9,5,1,13", - "13,1,1,3", - "13,15,1,3", + "11,15,1,3", "1,1,1,10", - "15,1,1,3", - "1,12,1,3", - "2,9,1,7", - "2,5,1,4" + "13,1,1,3", + "4,9,1,7", + "4,5,1,4", + "2,1,1,3", + "2,5,1,13", + "6,5,1,13" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", "ParentPageName": "汇报详情", "ConditionFormatRulesCollection": { - "Rules": [ - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ISBLANK('484d3ed119274a60bf32f15d178cf60'!$F$10)" - }, - "GUID": "89c4449b-a2c6-4ae3-91a8-b412927bddf3", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": true, - "IsInvisible": false, - "IsReadOnly": false - } - ] + "Rules": [] } }, "PrintInfo": { "PaperSize": {}, "Margin": {} } -}//aQUclE+ecgg9d6/OJ/K0nZ27FP1ypCufaKbVXlroMxZ9ECcgtA0YvRAyhr93thvLql9dhr8chbqBBqDl90b5+9yrkqoMD1Jc/c+zSp6Ima2cI1/Fbk+YjyZudvAftnv6iSAPlFAgrjAWh6eyQ7QCTWTtW617lsra1UiXN+cv86lbIKwpREiknOglz9mbMIJIkPTZukmnqH7zwuq1R9TWiudeWcXlsiJ/UiIB6lGd2e6gpv16zPxliNJ6jD0TMNzl0UZPugWIuqcojFILSZ/RioctUTImCFxgnlUlTaiiaxXRSoPmRY6LoOyODyaetLqhCwpeMYoI7SlHEHeD0GR7kv2caFbYC7haBFMmVgIG/CdSmb4s1q5t01XomECGc4frVIBaPGyY1TXWlveXmNs6ao5fWtD4/X8jEIig40HljxNqUTXqf7knO2FH8ySXNj/g7I8vTuePBKIeBxr4z7JrAHRVvpvSIzYbADb0yGE2Sl+u5wJUkcRTRuP4eCIm/Muta6Xl/ahGYsnvYUnNWULIWQorp8uML8EULrL4kBiigQqxj3n1C3N+3eI3sFop3azLDvgVBchtbYUtZ5GuxXMA5x9qzuCXhOXGETUfhkWbnMezJcP4VyHIw96u6Bi8ltT3pUUomFDa2Wk7TyFqkfgT2jnZAKnmPqvuHgD248MnRjJsWeS1sDJ/MyhLg970PsrupxpHSsrMdE82/WBpalEsavAN1RYh4ikr06mekuo6FcYgTqz64nUTZYNTBOfIVHBVQDPRvctKyqMiZ5ZI0nvBFnI53765gd0uGfGGMzx0Oj70EPER42Y/TJJDS/druwyPGXxmXKaYMyUR62gM9OxpHg9BLJyH2y3QryCd8OqsmNpViEW17RA9dq+Z/AtRLMQcaR66WaM3vnmN/gsBOPrEeQ==|920 \ No newline at end of file +}//1Z5HJQfJoNzhpoeX57OrzBtOKHDa8nPKPmU1fQVi09/9J8Tm4ShYxeiwUSNAUbwY7WpV0+o4TPoZZ/po8UAIgPPHSe/mHoTvBZwN78sIfEn270m63c/njk+4pLt5gXCd8jYv3ixVIuB0OFIoQ8kFwVJXG9MiFKQhjOAOjd5bTA8A0+5EQCk99d0ccIhAC9E7Q8My/jrOCf0EC8VEtLAQdUgqApqPEzmiufonXDilO405rsuq4IcYdNFkghI02Y13YmqyXPZunS/DCvES55PdNF/+/gTPeKz9NLUPNKE+qifRIp06omNxpMZJWfgIgtsi5dMuk5eliPdiuJ/+PzbOFNI/zGFY8XXq9Klk9nwiKfTuVVV0SoNv6l172QoZnDp/xvTvqtQ6RczleFSuaowc+6WG2VftNcE5TrecAw5XLhVA01Kxs8FAoLyp66CO8ai7jE1rJmoVMj4/gQ6K1XButIUwXj6/GfomJ+jGl9rwKMAV9D8mbiimDVO4fLEf5Qodpjmg3TVDLbWqsiJ/g9/qK2uH3sasl3qzCAEx3NxkKS16wH/CjnHUarbUdhCakD9dAucPo2Micc7bh0OHOFjsxjpheOMsObor71bHK3GV3e6aXYgwExqROcjnWARrPPE13oL42poUDBGehuCaGSFwKccmeF9r881Jj1P+vN3ht0J/cJQcODr44o9XUhmTZxyvO5HQDQJlQEVMVcxg0kQXwKPwkcF4/4MojBNcNIk24NjD3HN3B2Q2pd6qMXc86HoUWfaoQ0lsfh8KesM6vazHniigPAXT8fqRBEZ7w27DooQv7U29X9jgKppdYDYWluxH0ialYLaOC4QnCb2rd41Sa/EV0WmoD6kJJryZLpMdMHCIXwQcGy5/3Pc4Ws3JKToHvpUSDPKFvJ6s7jeGh8aN7w==|920 \ No newline at end of file diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.rd b/Pages/484d3ed119274a60bf32f15d178cf60.rd index 7d2c407a..a73eca58 100644 --- a/Pages/484d3ed119274a60bf32f15d178cf60.rd +++ b/Pages/484d3ed119274a60bf32f15d178cf60.rd @@ -1,5 +1,5 @@ { "PageType": 2, "ColumnCount": 19, - "RowCount": 16 + "RowCount": 14 } \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index bfd5d64f..e3f69839 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -235,7 +235,7 @@ "ShowConfirm": false } ], - "ID": "ee69e102-a572-4322-afde-faf53fe179f3" + "ID": "82010f16-4896-46e3-8f13-2688c60cf9f5" } ] } @@ -452,7 +452,7 @@ } } ], - "ID": "369e8c39-1f91-4b36-b6b1-04a19348997e" + "ID": "af12165e-2f19-4513-b93c-2f0336ade323" }, { "CommandList": [ @@ -467,12 +467,12 @@ "BtnText": "知道了" } ], - "ID": "79da7292-f940-4e9a-81b4-cf3e677660e4" + "ID": "d658306d-464b-4529-9b85-ba3f38093b2f" } ] } ], - "ID": "3b704a31-a91f-4c92-8354-9fd93cc1b6c2" + "ID": "6e411dff-c8f6-4360-9900-60e4a0788fc5" } ] } @@ -530,7 +530,7 @@ "ShowConfirm": false } ], - "ID": "ae8ccb5d-6c66-41f7-a434-306c54578b30" + "ID": "54dd4afa-47db-410b-92eb-76f62f11a679" } ] } @@ -634,7 +634,7 @@ "ShowConfirm": false } ], - "ID": "a6aa6356-dc7d-49ea-8b55-067b80994118" + "ID": "7061381b-7f11-4ed5-8a0c-d58bcfd1690d" } ] } @@ -740,7 +740,7 @@ "ShowConfirm": false } ], - "ID": "28b9d226-6c91-446c-84e8-3c74c0345670" + "ID": "00877fd7-c753-44b6-8a5d-b7990fa7daf2" } ] } @@ -777,7 +777,7 @@ "ShowConfirm": false } ], - "ID": "fd080990-7d0a-48ce-8da1-9028a1affbc4" + "ID": "d5bf03fa-e2ae-40ec-8a6a-5d9f80086b61" } ] } @@ -883,7 +883,7 @@ "ShowConfirm": false } ], - "ID": "35ab50c0-fdc4-479b-9e7f-70be84172174" + "ID": "677c9a6a-26cc-4407-9179-b4c92792bcd7" } ] } @@ -1037,7 +1037,7 @@ "ShowConfirm": false } ], - "ID": "8b6de6b5-5312-442f-bd1d-b7c92bd08ba8" + "ID": "2b618646-76ff-4fb5-88b9-b4178e45a2b6" } ] } @@ -1176,12 +1176,12 @@ "BtnText": "知道了" } ], - "ID": "ad1c2305-30b7-4a78-8c09-144d7ac26774" + "ID": "200b3781-0611-4461-9098-d6b507fbc5e3" } ] } ], - "ID": "19a30a96-6fab-4083-afba-7aa2268821b2" + "ID": "b7ec1fc2-84db-41b9-8fdf-1c3181c4a04a" } ] } @@ -1546,6 +1546,22 @@ { "Name": "状态变更回调", "Formula": "'任务-基本信息'!$B$16" + }, + { + "Name": "任务分组", + "Formula": "'任务-基本信息'!$K$10" + }, + { + "Name": "任务类型", + "Formula": "'任务-基本信息'!$C$6" + }, + { + "Name": "执行者", + "Formula": "'任务-基本信息'!$C$8" + }, + { + "Name": "任务日期", + "Formula": "'任务-基本信息'!$C$12" } ] -}//YMsMP+l1qFZtI+rpsA/Pw0wq6XfqGjy6Z+b1sqVSpcv2plOHorZh4ND8pO+JdFta/SXrzXk8uPldDYg9+0c3KHj8tATcYEN7ceUYUr69qIaXypwUpysJbjnY0wPPmLQISMZC2et3fYRFi5Bpcnjm1OxNFsLdD5UyyBslSzxYFR8fTMPyxxOaTYkVQ7MvQlMENpIE1iY5ENMraRnz2Tzzjb09Mx9+UZe170nyUsZdAbcuyPZFj9w3I7nrjFRN3VyRwExwaTLDVg+LGq/XxsKGM7NYHweSt6vfcbkjq0dtaqliy7Smn8UceFsaL3Rq2x73b6eSKjnqXteNy1KFcRuPxW0f3bVPIEzx5mydxGDRvEoULP0iM9lVA1qCqNZglDyanEkHUb4DojkebXhzsccuA83UL3E630UqNOim/0LJGaooVYQG+mCKN2LPllMnfa8UzhKxJt0AaS7QqDdV6D+DrHHgn7bRDfnBHK5Saoc1xGIn8ZL9/9EZJLoctlEKk7e7JYle15Z8toeFutu3DKHWGW1wWrfCMVsDf3dCnvk1QcZa2jD8Qy49RJuKwlpNypDn/mkkprU/qpRaYS6qn6QRZnw1BixYlcU+m3R5zdX7u/V3p6oUadDeOnIWzKHiHzhE5LwpKZK0D6EyBniA5X/ShFv6R9TaKlGcpooi95DvrKhciGni9nL5RqUT6CKYkBo9PmMB7yPrOVfOOOKY09G91AjFuSVRVDVQfbsQHAPbz7x4KSyMwYU9/91TpmfI6RTkwiHaghUuJa1EBeqoMDrad//sUM4FqiuzAUiarv2a6OHp9IU80luDVRZJEMjh0S0si/ljB53Xm+q09d076cIwL4U+9Mw1UrKDsfr42KURPKv8iSFGVa8Dcpc6AxPupVQ7XvoGRE6ClSJ4blt6QHtlWw==|920 \ No newline at end of file +}//iJriwnJ6GZVbz0kjehFj/I/IkuFR3pn1uhk2+s6JJM7DFlAzTJeZT+fYuy4VJHJMZnTkrskJRh8qheQbd4t8HsC9cSkzu0qf3oI9mJnrYMVWjTx2pnc3v7YkUlM9QjqE6CARrkMIewJ0Q9toOtjpuxxjF66nVbgIhYY6twSs8Yk9hZzZuC0eiSPCq4D+kmZAiqKYfzHNbSPT37P/KGUhQNcmuzo8SFGI56yZXxi4X+Bgbzj25NzZxc9YkK9i+32CySp7L6P5P6G4hIPE91T+gOIVQI7D44Dt6I08QcglVOLK7TYqWobS9dOjAijmUtc6EETLdtEhS8XDjufhLnfC8SELZj+lxujyC8vXssXaUN4K5ugSoHUMtR7mg2ej9uzCMTo+AykabJT+OdUmil1309SEMPmgDeB+vNXgJ2i1NaFTgxRTuTSm6kVbwVVLP62Vt9Nz/LPiY4pCG3eXm8V+DFZMzcAJNA/soX4MO6pDAS8EBIGn7q+ne8qwh2j3zLUuTq6tcxduN2nfKZD8kkOSunzx4K9k0BlLzLgVW9PFWhbte3KXnDHrrvpXJA/o/M9dzb5ywVYhOJWjgA4Ly+ZNMmLWO0zKS3JPlK5HImcSdtgZIrX4lqIXtvDtViiVbQQFm/IcHulhAUSJp6fByGXFL6wfZWm3A/UQZJ4d8CiNA27FN7OnARtOKSATNv1X4on+oxsRjTH8kZAZekUOEr1rPUI9VH51hmfXdnqlqQAMfjb9ncIg8awY4CAVQp4nhvKVYUI9QwAVjBGMjYw9v9QfSN+R+QLra/NOEN2dP4WvfvtJ48dazsZbj2XCxtwce3JpKMBcrhvjR79A5itRWdwF1zP5V4uptJP3OYpMdh58huj/tcH+3TTctihx7UmovA1uTING+5Nk3Zj8Vm3NOU21Pg==|920 \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.rd b/Pages/任务/任务-基本信息.rd index a7760f83..51f5b035 100644 --- a/Pages/任务/任务-基本信息.rd +++ b/Pages/任务/任务-基本信息.rd @@ -11,6 +11,22 @@ { "Name": "状态变更回调", "Formula": "'任务-基本信息'!$B$16" + }, + { + "Name": "任务分组", + "Formula": "'任务-基本信息'!$K$10" + }, + { + "Name": "任务类型", + "Formula": "'任务-基本信息'!$C$6" + }, + { + "Name": "执行者", + "Formula": "'任务-基本信息'!$C$8" + }, + { + "Name": "任务日期", + "Formula": "'任务-基本信息'!$C$12" } ] } \ No newline at end of file diff --git a/Pages/任务/任务-子任务列表.json b/Pages/任务/任务-子任务列表.json index a9820370..178ec9d1 100644 --- a/Pages/任务/任务-子任务列表.json +++ b/Pages/任务/任务-子任务列表.json @@ -204,6 +204,42 @@ "TargetCell": { "SerializeProperty": "=新增任务!父任务ID" } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!C6" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!B16" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!F6" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!J13" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!I6" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!J16" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-子任务列表'!L6" + }, + "TargetCell": { + "SerializeProperty": "=新增任务!F6" + } } ] } @@ -373,6 +409,34 @@ ] } }, + "5,2": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务类型", + "GUID": "ee1c3188-0feb-48ef-af4c-cb8578612442" + } + }, + "5,5": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "分组ID", + "GUID": "cce18a0e-7b0b-400d-a597-5a36c988fc7d" + } + }, + "5,8": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "d0571e32-50d7-49c1-b141-ba07319d9844" + } + }, + "5,11": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "执行者", + "GUID": "32305352-99a9-4271-9300-9d6c8ee7fec6" + } + }, "5,17": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", @@ -490,17 +554,9 @@ "4,20": 4, "5,1": 5, "5,2": 4, - "5,3": 4, - "5,4": 4, "5,5": 4, - "5,6": 4, - "5,7": 4, "5,8": 4, - "5,9": 4, - "5,10": 4, "5,11": 4, - "5,12": 4, - "5,13": 4, "5,14": 4, "5,15": 4, "5,16": 4, @@ -519,7 +575,11 @@ "3,1,1,20", "1,2,1,3", "5,17,1,3", - "0,1,1,18" + "0,1,1,18", + "5,2,1,3", + "5,5,1,3", + "5,8,1,3", + "5,11,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -567,4 +627,4 @@ "Formula": "'任务-子任务列表'!$R$6" } ] -}//pCdDeFq1i3wq7LSHTlj5TDC/Z04X0KMVr6hn/p+3LmoWJ7grcvyJ1hPrMeZ9fYpHFTOUSD0ITyORZIHH+zzQkfd6TkhcTX4bm8oATvpnwgvUWuCl0GxiuGolKzwzu2CXcV0TVLCtkBYNFnre80FWnEvJ/wnxl0TMtSCthCfAr23CkTtGotPEy3JMjNHzXQrUei9Uv/7boKk6sM+1y9zwKXM0ADhoHnXLD6Hq291+BIw9cQ0Kb65AC/Vti6Kr7xIhSKbji/MeIdllKvNXwruMCtg0bXsCwlUxaoxiTxD5HKG4hXIPs8Xk5nhoibk4eBxM4q98lR0Ui8gTFKLvO05LoEKsZaMH/rHmhMffz16Mapdpyiq4yhylJU0yqqUqkHzxYEdgvXalVkSqvev1C7yyf/7E1vei2fnMaP3Sfqoz/dgI69d/5msYGbGxHmR9muLafJf+E3bgPpU31m9qgwgv4igU/81CQfjPXOxjxBdK7YDQ/+tptK/v6uqvgZj9+Qn/4ssaikLdLHYMBvBJ4mhHSgc1GT/I3uGjQQLtj9MKXN1FLhI9MIaLc8DZFppiq/0PUHatZnYTovMYth4w2cQIMoEwdCXULkoHTDklM+nd3cVLUrm9oHRFq9YmwNAagw9oLpBTAMcL53P+4oiqLzuGyWFWcyihTYFYi5I1TRx7WhxCCg1hcboZus7Gyd78BNRNU0Seo/jT5Xw4fnETUddJk+YeIFy+AW+fPkmeMuxtMdBGq2VXuxNgInGXRlJGbhz+lhlrsgQE3h2U37NgJDFaWfmEtCwoZGyzYNsVPufyODHVhF7Qy1YpGLkhKvXA7hI5zRZ1S5uEso+DkgYXhBykGx2hvw8ITs+W89/HSKVWPscqV01sV57dYXqgnMoJBb4VAcSgUlcr1aLlOszMZYnhcA==|920 \ No newline at end of file +}//FqwORxC5q6lYKHBuufBD9hBoeETZ9/pGF8J2no295QXDRegMBMIy/7RSqtWIoeDsV1Av9emZbsHt38Pcb1Ylc1D4o9uPbX8JdRk7Dr4ZNqpxEutDuWHTFWfhCJt/cGQ8l+hSJ1d51LzRCOx8fXuCdjyXqEgsC6YLIumh9up1oI5QtLOtL+buaHnOTRd8suTmVYhKOGHSqGBp08Ylirdnn3GEeKlF69CCpxbtzUsm3suE3/Bb45Pg3XpOCwoE+HRWwGpE/g1XQJoqkmfL/VwUwqnc+XV1khyzRuYbVzgq4yiOqymsv4V21990/jl+MX2ZOjBDt3mtUgAYuqUGx9mxGhGOUYgiznUoPiaOo02qrqVGSdQy+h/wj/lI79Yt+D4HAUdzEgHoULHwy/Qmt8msv4JFKuz781eJqjrwGzJUK2T0UZNbOGng41Gy3HRFmUMXT5Ma7UbEGWuLkWGmijJn1hom9XI7/YFtw8NgMMlixtGx6H/emnsQFtqJRSJnNps+Bv/u+F95cub4+3eeq/x8DiTryxaUQHTnW+9a+now3P+0oxQgEPce09pYasPs/sGiagK3M37O8G1nwXjZtWIK+QJDfMFacO+y4BhvHvwjIMFvaQI8FNDYoOZ1BC/8eyL9LoGCSbhVTSQLm9Mo6mY+94xDECuqxAToXT2d6N809Bryk8VBAf8Fv74dFXuxNhiLS01K6aQhwc5FgExdyKDS7k22SqSFpA3mvEAN5Q36TWKFTz4Jd48Cxcy0unE4EC23nrvVkARQjCTyXPvkYkA6BAaWbNDhQ7oVHdTz/EPvD52ztR85/2PI1lbkRfwN6t+dbyJKlvhdwS7hBW2SZAAtd1chdA/LYptnpbyfQnD71F9CaS3NyevzgehpO7nmoo/C9LXg+uhZxY9QbcDkhLmdbg==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index 0f47e53c..6dddd680 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -575,7 +575,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "1fee086e22d54938be48cbeb9e4d82d7" + "ID": "5e36ae78f63a4372b9bce21fe2d7723b" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -720,7 +720,11 @@ }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "指定时薪单价" + "ParamName": "指定时薪单价", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B16" + } } ], "ResultErrorCodeTo": { @@ -766,7 +770,7 @@ "ReloadData": true } ], - "ID": "035a23c7-ff9a-4e8b-9ca3-038a80161b83" + "ID": "3a1c2f7d-f678-4cab-9dbd-d553c5cc6dbe" }, { "CommandList": [ @@ -781,12 +785,12 @@ "BtnText": "知道了" } ], - "ID": "d822d452-20e4-497e-9552-4ae92ce62bd4" + "ID": "637b8c7d-6d09-492c-b136-fbadc7cede29" } ] } ], - "ID": "7420f0b9-82e4-4904-9f1a-769886e2381f" + "ID": "b9f20530-1725-4cc8-94e6-9296cdbac375" }, { "CommandList": [ @@ -796,7 +800,7 @@ "Message": "用户已取消" } ], - "ID": "f9252f1c-0fdf-409b-873a-3dc9647c13cb" + "ID": "2e15e1d7-2cb0-402f-bf85-f71580475d7e" } ] } @@ -839,12 +843,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "ae80c0c6-b298-44bc-be8f-2d911b6238e5" + "ID": "3fa42053-5acb-494e-a176-0540ce3f6d9c" } ] } ], - "ID": "f09e7f7d-4a27-44bf-83d3-12c08b84cc07" + "ID": "5bad3470-f02b-4477-8131-843270cf2ef0" }, { "CommandList": [ @@ -904,7 +908,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "b0be88b9b0d049e7ae3cd94d4561f3ec" + "ID": "5b3f4e1a9e4f44c4b8c48c7eb6f7edfd" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -956,7 +960,7 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "82773e11-25d0-4575-ae4a-2d8b67b8b44e" + "ID": "598802be-fb96-4926-88c1-cb60e72540ee" } ] }, @@ -1086,7 +1090,7 @@ "ReloadData": true } ], - "ID": "8fe8805a-dee4-4b4c-88e4-9c36ed36043d" + "ID": "0ed27990-f180-4fa6-a493-a256a1ef89d4" }, { "CommandList": [ @@ -1101,17 +1105,17 @@ "BtnText": "知道了" } ], - "ID": "d24901cd-753d-418b-93c5-cd74e75d7b27" + "ID": "cada8fc5-aaf1-4b03-bd37-8bacc506dcb4" } ] } ], - "ID": "4b752455-e103-4669-9c73-349718002062" + "ID": "dd27db54-cfc8-459a-a3f1-8d0415eb880d" } ] } ], - "ID": "51edf461-9921-46ce-b7bb-9e2c14daa734" + "ID": "d94eb415-593c-446e-82a0-43f8d84b164e" }, { "CommandList": [ @@ -1121,7 +1125,7 @@ "Message": "请添加参与人后进行操作" } ], - "ID": "8ef432bb-1d33-4213-a2f4-774db9cb5bc3" + "ID": "f3526c21-3d96-47a6-a34f-0d2ff88f08b0" } ] } @@ -1586,7 +1590,7 @@ ] } ], - "ID": "ea75e4f3-4875-415b-9fd0-e351942282ee" + "ID": "b2388146-2a9d-4f37-8f53-8ea0a0266b43" }, { "CommandList": [ @@ -1603,7 +1607,7 @@ ] } ], - "ID": "35cb1cbc-39d8-4457-a429-6e3f2e6e8ba9" + "ID": "ca3783a8-0f4d-469b-8c1e-547fabbe3e38" } ] } @@ -1640,4 +1644,4 @@ "Formula": "新增报工!$B$27" } ] -}//fcAjTKURbpYntWMaY1feaq+HLcw5oL/rk1rpQaj0DkSnKkrVonvjsXkWYBWf/yJIve2N4XbuxCjTWiK8HhdXEnzJDfhMUwcGQNHv+67BzxlYgXALJndQtFoeM57vnL5Yp9TG/HZoG0Bs3N2rHdx8ZDbmIwmDHuAaRavT5N9WdAGq1faLZ9dSrO2f6B1JJC2DUvNpPhXAV6j4hUuefk/mzglFfAB7ba6o9E2SLbI5N6hAQcI/Mx87aL5FmhAuYHyNH33+wKaN52Y1pxoxVaoLPOorgI8RxqZ9KgqsayhUVy+F6kNQIR+xpW2gRNHhorS09xp4Y2pr7x3F8f6hmnxIozDB8zkbWHE7JFptLOr5igHssxE0K6s8i6FmXTLpSm7FzQygPfRwD6xScBh8h5doFFvCXgfgoOoi5RPWPclkOI+VXKdrgj3UV0DARCP0pw4+ZbBAr5YmgirhWCXE354B3VQJ/xLYkwHC6N2+sphRFNw21H/fPK8Ib4AkCbsxqAn0W+0BuHrjYRfuDAGv8iRzLz6G/xjTBLeKkfo6GRZu7Q7dTSohLeI4/YtY9yw0pMxeFcD1gvAKa0iVkTrYsVfPlAHrX5GUk5x9uw02XZMGVMqYWcsx/BoNJIekC0Uj7fi0T27wD0MsXBYtWx+Jht9eYaAJTT3VbjG20SJk0PKzg3yoFWqlk9rGEp9IW2Ng/UPi03Yp+umvmNBdruNIMBV6afV9yoBbU9E4JHSz0hszzyNFJG5/AGjBQD1R+ugNnr78XSjxEooGSITTBmTOUd+RS9wwHcEASzGd/ZocgNLTgjhwmQejQxxabzivKSnHpL2zDJOGbnY2/1v25vq1rRsGn/OPSB/ZY8A1BuaGVlwyedKBw4vQT4HgsNmjfPBYDIDfHCLq7AA275J9r8KHhqXV9w==|920 \ No newline at end of file +}//VDagVxypAQTb5c30m7PKyfPG5vdifRokajJxueanFVUdfnEwGUqOdRwXE+n08YU6MXHzhwVN/hE4aGAj27zftQ4ktnZ0bUb0IgG3K9YH1k+hzqR20zv/kMYbaRZH042dPmihOlbPip/djVxW6lfuks/WxJ6PD3ruB++vZlrYt9myVrQYCiCjmdmzll0pqGRsvC+fTeB0SX+msILGH1jHNIopNkHQdHfVUHX7r7ITHkHZlLkl/IbOXCkDfFtGalkdAAnyoVtCOMHypzyeHd3s/6wY0pFs52Va7giDZI3aAwYni4EJ4BLPPzP/eV+8RxGAW1gZGf/t7BL8X5GJOJi9WluztFvceyLwYrmGSt/6EVmyLBQO+aT/xE8R6zkzwRPg6/zjqFSMWkm9Wvupkeg5sZJIS2WZ2hyrgVkjKXvVgKHoIOe8tAtJSPbxqLNTGtaLLgppNYVJ1vf+TdXNQoQ2zTsOk4Zw9LxaxIqudMvgYXjP3/P4bh9x+YnJqtuJ+YaNSucCrA6EASPYmYmL8Wfb3Y7SIvoSOujuAuT2evksBYCRxnp3gUth1wSsOVcWs5+0s+QAExFEKlDJgbvbe7+g60gRyu3J9Q8RYY5IYAP3ZiP2519m63Es/shJ+yBi9zdE+xQX8nQHhB3qKLlmoG9M7VKTlqwqeuP7IVWjErNmvTug9CXK7ymB9dVHGsTz5MvAoILZpn5kl5Ye6Geb78Y/k6u0+G4kk5vto8iw4dJo2W1W9g1T4X9dc7wmIDr6JR53X+b5w1WaKG4aj5TzYqcTe+o0vxHR+ti0OWbqmN71p4QUxDznI16l5n7tyzWIwkWskeZv8onJFTji1QoRtpup9HK9t/BosyjDmgJ2fSHFARmycjInaWEq3ls82jjy7bR/tKC1nqhV4n5ey6lF/62pQg==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index de8b9bee..6e3467ce 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -244,9 +244,7 @@ "21,36": "提交" }, "Formulas": { - "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")", - "17,1": "\"预算\"&取项目工时核定方式&\"工时\"", - "23,4": "IFERROR(ODATA(\"项目表?$select=工时核定方式&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)),\"计划\")" + "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")" }, "AttachInfos": { "1,37": { @@ -456,7 +454,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "1011e1be-02ff-43e7-9802-b5528ab1935e" + "ID": "d143c6fd-5fb1-412a-9075-34730615b499" } ] } @@ -715,7 +713,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "a49d2539-d030-4983-9d01-877fa1a571a9" + "ID": "9bfa406a-a757-4dbd-8336-0152cae9740d" } ] } @@ -1113,7 +1111,7 @@ "ReloadData": true } ], - "ID": "65312ea8-0bc1-4202-b561-e3789bf4ce48" + "ID": "73fbe0f5-33c1-44d9-a89c-2f5437ec694a" }, { "CommandList": [ @@ -1128,7 +1126,7 @@ "BtnText": "知道了" } ], - "ID": "c778b3ad-23fc-4ab2-8712-8d28a084585c" + "ID": "6393d1fe-35f0-4e7d-a5ce-cbfea04fff78" } ] } @@ -1231,6 +1229,9 @@ }, { "Background": 9 + }, + { + "FontSize": -1.0 } ], "Types": { @@ -1605,7 +1606,10 @@ "21,36": 19, "21,37": 3, "21,38": 3, - "23,1": 20 + "23,1": 20, + "23,4": 21, + "23,5": 21, + "23,6": 21 }, "SheetStyle": { "FontFamily": 2, @@ -1631,7 +1635,6 @@ "18,1,1,18", "5,5,1,14", "9,1,1,18", - "23,4,1,3", "14,17,1,2", "11,17,1,2" ], @@ -1665,7 +1668,41 @@ "MethodName": "Focus" } ], - "ID": "cd8d4c6c-54c5-4e0b-9529-413d6bb84032" + "ID": "841b18ae-3fc2-470b-aa26-69529fb01f1f" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "ebcff32e-fbce-413b-ab45-e4b8b41b5f55", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式" + } + } + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增任务!17:19" + }, + "Value": true + } + ] + } + ], + "ID": "9715b6db-c58e-4e2a-95a1-78ebc9bf0f5a" } ] } @@ -1700,10 +1737,6 @@ { "Name": "项目ID", "Formula": "新增任务!$B$13" - }, - { - "Name": "取项目工时核定方式", - "Formula": "新增任务!$E$24" } ] -}//woeDsnt2dVGHZzR3ZlY2t7SzFnhqs8k0ckdRN0E0auRL6E2BtjlW37EBcWno++ayvFcv+MWEqsSF12NHRxs/FNQ96uwddtNPdeCM3HxsjVPukjj4dimIk/NyGwCIVy721ff+/DXkyTvuZ/jnqOTSKKbgCsaiIlfqXZeRHWTrEhhO4bgh3v+CjxiMJ3vMLpKA2in3GL0OAZ7LvZTXAAMmB4V6DeRF/6h/t8VBnM5aaIw2yZ9MyxS2jNSYTFOfolMssjISvBqul8vl/2YN8RoMDm6DXNUTopsqKSMpELs4R7gcXfKkV6LYwvEOt5BD96mxQtVdHT9TZt2VT3jDTMMllrTlqUR7GIkDLmjWQtA9FGCsWNI8XIPDdw618i3DGjTb/CYMhlhFev1Z5NWK8Bnqm3vL2GIYrmqfvYpTSJFUmkeGC4ymuz+LCJd5EWg/ZL+0JtTYSU9PB6d4orRyBIFLjnDQM6EqeW6zmTDg4PmTJrfWJISjNz83Z67Uyxji6qVcK7j7YTVFgNIbFphQ1xeiUAFS35uWBMsEEr9kpR1WArt4YsTDV6CKY/X2GWndPZRrai0WMiN1Mik1dSTJ85TezEP0XXCgFtzcynEn3ChCXUE9Wt/POsA8ELTsH0gwDX8gcZ2ev0nOl7CtXmflNZ8WGQdAkhBGOhWKXMl74lImtQ8k9MD2ViwUfKRsg1UsF6sM5af9T2pT1GDQcEtbiL+G1JvIgYP17Q4RalZMFe1Urgd5jzUZGEQuSpe24yr/olfWR62v9AeUmZ6PKQCw/4IzhPJeMvjtfAp6cR+t5zMG43VmiZ6pYFjmCoSdFfF+j3ksbDRXxoFhRlGsMEpFtNKQf4yXiQ1jBf+4ohnwGTKHvG4AbzIVngWIWTkbunS8YCJ9y7psy9x95gDiGtCEyRad9g==|920 \ No newline at end of file +}//yzYIzdz5XcwiDadAJj/13byfZ2wKCla5q+G2zlL/I1w9bxQe3TXflN3v5HE8NnfVEPPTVUXGcpAyoOPhRLQcSH0Qk7nWgT6SHoGB6W29ZpEvNOw1t60J+SYrSSMHk0y5V3RkDkgjo4h67eH56q8Z1IUQ54+Ho68TJJ2C5VRdrAscfHV72NcciSed2VlKZxUwtj0dw+/0wUQ9drDHn6v0arDR6db61jVXXiWk5uYf4HvXV+/sPl0pGmxUHufDXsC5++7zTZCfMohp1oMb7SzrLq4I5b+NZSlRuCASbNKAHrp/3LlIfrR1sZSTgxMr3kYIZWua4fsQVCE3Uga1Zf2XK+z4RKuZ2cyjSfpLgHiQrGqltT0j/YEdLJqTIoraXdP3LU6YDUA/qnCFlGOz0I0no7JR+77vqRjCTPHGAvKejuAuLTT/ZzXs0ceE8pG7vV8BdSIzwSb8NmZ5hZ5UNhumJt5jjRa4lHwzsp2NZl3++n6gopIlernRrCYrpR4hERoRjKLfoLvwMNfW9zFaFso2bBzOLMPqvIcmnQM3pBKGBjDO7zS7Dl8InfNgHoCQjJ9wUsCcvMOokiftxtG3osvgWrlDkemLMry6zTw8CJ8di3R1bzqccQi2athlvuYoGUCJy9w2B+sT2vf1zUasDbHlOo6TerIU2UNIzH1ZqVcmWWJfmPwQoh8mlOsND2ycSraJPB4iNy9BaeGcMmO7F20D0WJ6DYRGltloF9pNXdyJQN2ZWvSQ3khpUNOKG6XHRpjGeAioi4cOJ8iwlD8PDOsD7MT2mvdhobcCRnL+LlqsPDGKPxQ5Q4t0Hn5fPG2+qmehrY7LDyAym0lyR/V9AeBIC4BU2f4O0gCrUbF3mcrSviFlyMFPE/YKZaeGJPj2AfYWI6E2FLCUwGjhBCm2sWKNSA==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.rd b/Pages/任务/新增任务.rd index 928fa6b1..72cf864a 100644 --- a/Pages/任务/新增任务.rd +++ b/Pages/任务/新增任务.rd @@ -3,9 +3,7 @@ "ColumnCount": 40, "RowCount": 24, "Formulas": { - "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")", - "17,1": "\"预算\"&取项目工时核定方式&\"工时\"", - "23,4": "IFERROR(ODATA(\"项目表?$select=工时核定方式&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)),\"计划\")" + "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")" }, "CustomNames": [ { @@ -15,10 +13,6 @@ { "Name": "项目ID", "Formula": "新增任务!$B$13" - }, - { - "Name": "取项目工时核定方式", - "Formula": "新增任务!$E$24" } ] } \ No newline at end of file diff --git a/Pages/汇报/导入汇报数据.json b/Pages/汇报/导入汇报数据.json index af472bdd..06850093 100644 --- a/Pages/汇报/导入汇报数据.json +++ b/Pages/汇报/导入汇报数据.json @@ -191,6 +191,11 @@ "DesignLengthInPixel": 32.0 } }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, "29": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -200,39 +205,18 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } - }, - "31": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "32": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "33": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "34": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } } }, - "Count": 35, + "Count": 31, "DefaultSize": 32.0 }, "Values": { "1,1": "筛选日期", - "1,31": "批量导入", + "1,27": "批量导入", "3,5": "汇报日期", "3,11": "汇报内容", "3,21": "工时", - "3,25": "关联项目", - "3,29": "关联任务" + "3,25": "关联任务" }, "AttachInfos": { "1,3": { @@ -287,7 +271,7 @@ "DefautWeekFormat": "yyyy 第 WW 周" } }, - "1,31": { + "1,27": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -337,10 +321,6 @@ "SourceCell": "工时", "TargetCell": "工时" }, - { - "SourceCell": "关联项目", - "TargetCell": "关联项目" - }, { "SourceCell": "关联任务", "TargetCell": "关联任务" @@ -359,7 +339,7 @@ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" } ], - "ID": "7111282a-4981-4ccb-91e6-86c77ca0d67c" + "ID": "8b162166-9e2f-49d9-acad-ebcc4f190d8a" }, { "CommandList": [ @@ -369,7 +349,7 @@ "Message": "请至少选择一行进行导入" } ], - "ID": "bf270bba-a245-439a-8932-70ff1ac61bd8" + "ID": "68b43c89-01aa-4c4b-98d7-cef306d256c9" } ] } @@ -392,7 +372,7 @@ "RowIndex": 3, "ColumnIndex": 1, "RowCount": 3, - "ColumnCount": 33, + "ColumnCount": 29, "SqlCondition": { "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", "SubConditions": [ @@ -488,36 +468,11 @@ } }, "4,25": { - "NameUsedInJavaScript": "关联项目", - "BindingInfo": { - "TableName": "成员计划内容合并视图", - "ColumnName": "项目ID", - "GUID": "d0955b40-c1b2-4696-93cd-a4aece3f44cc" - }, - "CellType": { - "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", - "DropdownButtonModeInListview": 1, - "IsBounding": true, - "DataSource": "项目表", - "ValueColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "573668ee-bc6b-44e9-97f0-dae3d73a66e2" - }, - "DisplayColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "项目名称", - "GUID": "8bc5331c-d1ca-424b-bc46-2ecbfb6ed887" - }, - "ReadOnly": true - } - }, - "4,29": { "NameUsedInJavaScript": "关联任务", "BindingInfo": { "TableName": "成员计划内容合并视图", "ColumnName": "任务ID", - "GUID": "af4c8ec1-3a42-4381-b33e-b23d8b049213" + "GUID": "12f36d5e-4025-47ec-ba9d-3b57e18235d3" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -649,7 +604,6 @@ "3,23": 0, "3,24": 0, "3,25": 2, - "3,29": 2, "4,2": 1, "4,5": 3, "4,11": 4, @@ -658,7 +612,6 @@ "4,23": 0, "4,24": 0, "4,25": 2, - "4,29": 2, "9,1": 6, "9,2": 6, "9,3": 6, @@ -672,25 +625,23 @@ } }, "Spans": [ - "7,1,1,33", - "1,31,1,3", + "7,1,1,29", + "1,27,1,3", "1,1,1,2", - "5,1,1,33", + "5,1,1,29", "9,1,1,3", "9,4,1,3", "1,3,1,16", "4,2,1,3", "4,5,1,6", - "4,25,1,4", - "4,29,1,5", + "4,25,1,5", "4,21,1,4", + "4,11,1,10", "3,2,1,3", "3,5,1,6", + "3,11,1,10", "3,21,1,4", - "3,25,1,4", - "3,29,1,5", - "4,11,1,10", - "3,11,1,10" + "3,25,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -722,4 +673,4 @@ "Formula": "导入汇报数据!$D$2" } ] -}//nId1m1TUK/fwuPAwh5+9kRE7vcRPumc4zCNKypHYDPLR80vn2yiA9aqDXU7WcciYOK0hFefWG4P2/a76DqlMvA3W0mFLA8981WvE87DqtEkyjMZg1gIHqLDlg1F2+jIfNB+hN+7Nrk+rJHjJLdRThe7JcJ5kXN+i0f2QvTHiSMVraY/6i5nLDsNmXj1A7+WMIzhqn2pnN3MI4A4RwX0PhU34FONdeX20nHsmOn/3OC5iZNlc8QM1alWD524xMHWYRZwnkUE+qauaVniaV4fh9B3V/+M33mD6WbcIY919OcB0H17uCDF6n8ke0erikRazKBD56A+nKCRJlHThoyycp9AYyZYje9f3s4XyhiUdDRb6mZxGkvJfawzucf3OYO+Bxs9zq801u/6rP9qazMKwqFrYSXcwy3mz+zgt8k40mGSQP9sA8yoAYKhqKUBx1Nls080eQTou2oxmQ2STnpPdGo8Kr5tjWdg4ASz4b3OSZVB5MgIyeWMeOhSLsPfGBS3d3YiJgx9sQY7Zv2C7Rhp6+M2cbCQizUScfQO+faLl+p7earQWUwWoVFP97J9iNRC3KspP2GgLnQfiTYOQagANc8guhcpE7Q2DvltDdlECplnsR9toPSwntBgmuS97kBsSR3MPimY5eEJoyErBvLN0awrj+sdy6uNGdsdXx3p++hfNaAPehkrsgvbOmUVj7ZLUszeyU7OijrlDWzbrrFXvSPQSqQ/ZtUfEMEaYbIUxJeFN7xZpAXZod+5hcqLPqBxpPTz/tMmKipDk+U+NT55D8VfUD5NF1IKoXs+Olbt2lTHApgGPwCBQF6Lb3fJyjSEqhE+7G9UMjoRMysmpBevsM7GPNoEcJqBHx3sEuTdFAzevxugt1xbSZpaVKRg3jRHfc39absm0jJ1cKAcxk9dfJA==|920 \ No newline at end of file +}//yEBJJyf1NUA2mur4TvpWoaa0Ynp4QKdS2S/wrqzYn82xqlkYUxwds3mh1vAl0SzrRNrD8C82GKE2v/DdNjfz/HG+tkzY4tXpaNjgeYA4JNQjjc3JBMaKHpLsay3Z/CmBEKe/0oINfd/NDuUYQx/4Q7Z/+5AladholeopA7EhaN4Hz3xS1i+YPThBIojdXLbSq8RHFYoQNyMDZqdQjGmrADcbTUe01H9mPcxqwBVh1UyA9ND7NBFBISpoaoT5vPm7ZM5Ovqzl27Ti45ezYYryY7CfJXyoosVFu9QUjTTKGTuRLuMsgENGYwTddU/k6fIz0PA2h8QMrPcQLHQWl1bZkVD3cC4+bX0I1/6Pu483avx7Hu3bvPMy8CvJkkJ/VI3g/SFpmrHb5j+RmRG7ZNAKg9RHep9zuijt24ME0TB2chY5WfdNmZPjPW4+s18dnPL1qUUiKAC54NWnyZTb94DRVuzGY1gJJB49jbf3OdBUfSD49HZL6lqboksAgkaZFAfGB5PddjpgLcSb4K2fv+zPeWV7fC9VlisafFoBBPFZ8XT7XwKghoU0KYCWJN/vwfXlxVKdELm8rfPsL/qOH0Dhg702IPxPVd/CdtmEe2mwZDTk8FpdIw97ymCVh84iNcIuBv4JKWt5yd0fY53ZZ8Nne9Ulj5hsoG0wwpI4deJrdI45Kozsr8hSb5/1LpJPzYrd4jCMVudbr6cv+RsekVesyugNavtyBQXswq3eLkV7drMHZpHoxpt/IlF5Uf1ABsviaIFzFmg6dk8mA+2Q2CdCMU28FWkwraH3GsTeYoHTPr/gWd55NKK36fmu4HyE2ktyiuJqXWmVP2rf8IJ93WjfobrLOp1CiIvouq7n5LFuesjxpD1j9Arg/F7unRK0Fb/fmN5D8c+mSU4un00Gjqy62w==|920 \ No newline at end of file diff --git a/Pages/汇报/导入汇报数据.rd b/Pages/汇报/导入汇报数据.rd index 354d759f..3ca4eca1 100644 --- a/Pages/汇报/导入汇报数据.rd +++ b/Pages/汇报/导入汇报数据.rd @@ -1,6 +1,6 @@ { "PageType": 0, - "ColumnCount": 35, + "ColumnCount": 31, "RowCount": 10, "CustomNames": [ { diff --git a/Pages/汇报/汇报详情.json b/Pages/汇报/汇报详情.json index 96974c83..2d7b288d 100644 --- a/Pages/汇报/汇报详情.json +++ b/Pages/汇报/汇报详情.json @@ -495,7 +495,7 @@ ] } ], - "ID": "1ed0c68b-5796-420c-8766-bd84fb7c4fec" + "ID": "45e1c075-7e6a-4566-ac12-3795b9869bc8" }, { "CommandList": [ @@ -510,12 +510,12 @@ "BtnText": "知道了" } ], - "ID": "a2d23c36-2177-424d-a3aa-f88344d14092" + "ID": "c8ec2b09-8ef9-49a5-84c9-b7a5d6e4eefb" } ] } ], - "ID": "c35f0d15-6ded-4cdb-8747-76200fa9097e" + "ID": "b02f35a1-4480-4543-b2a5-54e45099a1e6" }, { "CommandList": [ @@ -525,7 +525,7 @@ "Message": "请选择汇报日期" } ], - "ID": "1c3b537a-68f3-460e-b930-8ba6175a4178" + "ID": "a5daa381-34f6-4623-b793-dbd270593172" } ] } @@ -657,7 +657,7 @@ } } ], - "ID": "4267cd34-d691-4bdd-b49d-e6ddb2aaa481" + "ID": "7b6a8bc1-3e2e-4a2e-98d1-a027679fd888" }, { "CommandList": [ @@ -672,12 +672,12 @@ "BtnText": "知道了" } ], - "ID": "c4a5c5ab-faae-470f-a93a-7c5bf99a6b26" + "ID": "e898ca70-8153-4116-838b-a7e555a718a0" } ] } ], - "ID": "20aaa4b9-a31c-4d9e-8bc0-304368e09f13" + "ID": "f7bb29d5-efea-4f0d-a441-bb68c0e19746" }, { "CommandList": [ @@ -687,7 +687,7 @@ "Message": "请在下方编写你的工作内容，让AI帮你完成左边的日报！" } ], - "ID": "3a9c80de-e110-43ef-a4b9-a37ddfbc1b53" + "ID": "8e7de297-3a41-410f-819e-767c385ff5a2" } ] } @@ -864,14 +864,6 @@ }, "ColumnName": "关联任务" }, - { - "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "关联项目", - "GUID": "f609f2cb-3b72-444c-8bdf-ff730c6abcab" - }, - "ColumnName": "关联项目" - }, { "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1018,7 +1010,7 @@ "ReloadData": true } ], - "ID": "2917f64a-71fa-43d3-b7b6-ad185b089c4d" + "ID": "5079bcad-ae33-493b-8cfb-0046f8211221" }, { "CommandList": [ @@ -1028,12 +1020,12 @@ "Message": "该日期已存在汇报，请前往列表中进行更新。" } ], - "ID": "c9ee1fe9-0bbc-4d23-8e55-6d7d41009803" + "ID": "40a258d2-cf19-465b-8a16-4a23c7761c39" } ] } ], - "ID": "494ef1aa-58a0-4e19-876d-6501148a8ecc" + "ID": "4d66724e-5282-4b3c-982a-f714711fb9f9" }, { "CommandList": [ @@ -1112,7 +1104,7 @@ "Message": "保存成功" } ], - "ID": "09bacc9d-53ac-4d91-a099-82785e89ee4e" + "ID": "d4e0e1b5-8708-49a6-82e5-5510594b1dc0" }, { "CommandList": [ @@ -1122,12 +1114,12 @@ "Message": "该日期已存在汇报，请前往列表中进行更新。" } ], - "ID": "bae1662c-1438-4c66-877a-eae322ecf6e9" + "ID": "76611ddc-2e5d-4b74-9366-afeb5933bf0b" } ] } ], - "ID": "11c9672d-ffba-4a8d-862c-2ae9aa008579" + "ID": "f868d27b-3f8d-4a93-b9f4-084b6f1cf1e5" } ] } @@ -1456,6 +1448,7 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "ShouldCheckDirty": true, "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -1495,4 +1488,4 @@ "Formula": "汇报详情!$Q$13" } ] -}//o67ujDVfiX0B9TFHQNP/T3o6IDq8WZNaKIBPhzMlbFszbKH+ZMYT8UvCAVuP3BlGaVgTFxT2mykc755wMxB3KU5I9vPkLXFEQQqZXpt8zqii2sM7Vy5mMSPrfHStrTiy2SRRyxD7bZ/Puxyt7Mr5TRpJJoSDI+bgXoQk6ef3j24+ZRCJy936BmJy6DA0kR5JRh9Kv6GFY8Thq77AT9M5dc4VCenM8cGilteNgwDlp01sOeELYeJ2BGDRuoxRJsaYlpFXqMTptMfWl5PXDcbgf1zuztW5VlSRlu/8xtc51irLiBXHe1lvWtiLtVcds6zd/D7KZ58BxN/N8TgeJTsXsq1kXDsdPRWxVWHPTfRp/wTE40s2apm/TFBHiqF64mB9meaHd5Bg+qbzGF9lJyVfD6IUg5H4JuxHZbTXzB1zX5vssb8l9D2+kP3dLhj3k44Hdo7681a2+yJ03n5pjen5taGQW5sai8C8eXwKCVrNXv5Ay1r5rYfX9jq1P6c2YlgHZKgMf920e/zUo5++IiKqkGNxx8q48Vbt4GUqFZmgMJIRzrEhijuNRw2KGTYQMyh7tkK4G1M/Zv+H1C43VpTZU0Alw01XDf7XrG51hGvGvMOT9YvCSNpLNrBPMHzBLZhwJWaGRj369tsjhGr41GR1JUK80LuKcYu7wIPCSvIL+eZ+GEUH5yle6blDwIKdEgoL2kvdSJ7y60CbLYUJpyUZXTkmbvJMPsyEnAEVu3f8GxOJC+/NUmS2aN0j9sdMmhUSild+CkHfpjRxd8NpNwNGudhm9ZcbvkZDc4DLg/NWgOb1Prf7XnVD1qKZOLwrK/oodd35pZwJXEtSnx8vXfMV47lHXbEIb4hS1IhPzZtVVvWXC2EOJ0Zd3G8CrOTIpNIgDkojwgBCYqu+HbG7JURuSg==|920 \ No newline at end of file +}//3L372o5H7piKyVq0RxIgq14yfSYO4Oi7uxdwt4vLYWYfl1KX8cfj0NlWGHEoCDvKRH7VdTFqkD8WjpwBtVxpFnVF9KmP6+GThjnDHy/wa+EQJ1+4uTTIcFu23516wrJDXdBrp+ycO7e5U/UbW53BqfoHcjz2ryopFaCOCbge8JZXFwEeBcBCaW0vum65QVlrE6YfGYU0LabSmiPSf9W/YeotF/sJEdf1EGD6BBHyR1LByrkpxsnNhGa+zcTLAyAPrwRFFS0zp8K/6POkqYcomGjITxHr43iGhBBaF6f3sgTABASXuq9iEs41Jczj+OGGlx1JPIUxVvPYRuWm4IjZMSWB+nCyiI64e5fccd9NKCGQuWzWg/NoSdlyeWRTxwRuI+szHmUHxOCdFlOSOuk2IpBCDuQeqQU4D8gLpZ/azSiYbz9/539rw9zHfU95RFy+VnxiVqBuTlEzb+KhKHyfGEjS7/93wrvl+WlgIuRyUdGhjwzcxCN0abl62CD8dZKdZXSAj6RiBOJfp0d0ObROYHJU/cCE4rp88xCTnKojkhwc9sBrrU2rN/EKAFnD2oC4tLtWq4pvJGB0xnbAj9J3H9XTrarUBbvL/HS+KGimRL5wAo6v7ZEF0zDTv2E41Q63ulmjB6Nt9LOf0MY/46MoBXNNMo0znhw7wGpLHRHb+RzAlHdhUbrREim7Vp1SOawmE77jOnRPnq8sMi/h1AkqrZDtR6CtiW7/9fCbmvR+SXslew/HuCvFAoeIO15Yrc+i9N12vfhfkTSbLLAiqd9WH02fo6yY559ZakoHdGnUEuJdT4g3fEVqF19TlaTP8JPmh8yMtlBkVqdqTKP+ONXnPYoAwNOe9z2lCao6fMV4lnOSlUUFZnpcodQmgayB1XQsmEU7mxpjEB/5/u49fH52ww==|920 \ No newline at end of file diff --git a/Pages/首页/首页.json b/Pages/首页/首页.json index e798d608..4f0d3f23 100644 --- a/Pages/首页/首页.json +++ b/Pages/首页/首页.json @@ -94,22 +94,28 @@ "Mode": 1 } }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 31.0 - } - }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 31.0 - } - }, "17": { "GridRowColumnDefinition": { "DesignLengthInPixel": 34.0 } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 31.0, + "IsHidden": true + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 31.0, + "IsHidden": true + } } }, + "InLogicalVisibleIndexes": [ + 18, + 19 + ], "Count": 20, "DefaultSize": 32.0 }, @@ -338,7 +344,7 @@ ] } ], - "ID": "98d2bbb0-f186-4851-918d-e8b88029d07a" + "ID": "527644e9-1257-4648-9228-c8a1c9c90e3d" }, { "CommandList": [ @@ -358,7 +364,7 @@ ] } ], - "ID": "402cfb97-9cfe-42a4-87af-4015c3c26265" + "ID": "b232bc9b-8923-4a4d-8c99-fa0afc4449a5" } ] } @@ -543,7 +549,7 @@ ] } ], - "ID": "7ff72f54-cef6-4560-b009-d3e807a8ac9d" + "ID": "0f431da6-014c-4886-83ed-254e317d068b" } ] }, @@ -594,7 +600,7 @@ "Millisecond": "1000" } ], - "ID": "9f34686d-83ac-4aef-a600-097220b6e2b6" + "ID": "b9b8c2b6-8fe4-4658-9f8e-f4c3be7a301d" } ] }, @@ -678,7 +684,7 @@ } } ], - "ID": "3348edd1-2799-4b6b-8c7a-2cbf55b73375" + "ID": "521262d4-5f8c-42f6-96d9-50da3f5a364d" } ] } @@ -843,4 +849,4 @@ "Formula": "首页!$M$19" } ] -}//kccO+vOZjw98uaDZvPIsqiI9gh3C/s3DJHCQcptu6hZbqW06OAGhBDDUN2v7+d8psgqN0ufiUvDWkLAsoXUsXSIirmU4hT9UKGLXieFSLA21TSFA5TvfyA7AFb8CBDIclYnu5rLyiCuLwq+hrHWBwES8GNmezrUzZNre5YeonMWvdmWFr+DdukfXDIndHe1MJadDOTa7DNRUF8nk3nYCok+RxXFdJGcseBtuerTDbyI5XTLRblTw2AAv+FlR0OLToQohF6S+Qb9FAKue1dMl3N/Gup5XqMuqQNF03Vd+01j3+0N7NmgXAkMc1uh7lovDiIw6ML9fmpb6IDPPZGqNOUgtw7gH6p0v4f7XxsCFvr05jG4VTJEkvpn2VsA0xUxgvHklwqKWzK+an9yCWlBqpzB+iudmkuxI04GiHq1yEFs5zsmrJeYZUE/y/OmEwwBJTqUuuHUuIb9JlSLOWl62pwt6hX4yiQonpIHy3QotPiRo+jr85qzEyaaG6JSjGYwjOMwNIo00IADBRzu6+QAXQiYChSqxXJPecJ5nvPIaxljUHcVmL8BprldbFYvNSyhelWEv8Isb9trbrK1QZ20JYS73KGl6xim8P54n/GC5QjbE9hqpcQ7z0fT2Ait9bpOf2uN5LGsL5tNf0/Anl3xSjjSiU+Y7tSXVpU3zDcSEuZ1HBCTTjcyHt/RNv9u3oDHf+vCIqai5ZaWE6tzBCKvzyWY/ZsJ9TGd0/KesGfmPHalBIRAY6b4f5hftz3k6T1WNd8wcxzaFfjqfkoxgtekBzOAebaoKQrdncp2uaf7FQnSnOnrfLPy1m0x88O2FzUCYGQNrZDCwgoXJktpYTIF3pGPh+PrIXD9E6Qj5iQsKLhJXP9KcDeVdWfjkrJUx9iM/VzJP3QFAya/YjkfmXOO4Xg==|920 \ No newline at end of file +}//8NslKoXYaOpeXx23UovLzaZuo6ReHYpMIy5itryDfilzfIaVmwpKLnYCN6BvkqMgX5LEDq/T2/TKmbkHgijvMAps7RqrTK7pkyOTJ0cG19BzsPL3M2vBkh5iEAoB6mXN24Xt2wEyDNl4d5kp+qQi4+312aszk7QhG+Da1/FwPXNAuAdPcDZ5iKZsEHDws5++1cl29q2ZZIrvN7wv8bDHQAQz9ER5HP+FwommACbeGyRLg1jVKGBpTkIZSapzxZRSiRZJlyUafIqtGIbwzegDwdR0uWSdhyua/nyYbjyFyPTsQvkg4uhtnpjf/SFwDUR19P4ixiMN/eZRSEK8lwmxzzo8wfDVjiobJO19SsTC+pZGFR/IDEZnqHu2Dn4Vm88/8x/zw2usrvLK/rYuEUf52DAWNUuLAYdQISJZEhqw5pZWMlDDLOieR0d8aUzj/a1fqj0fUJRB6YnoZ6EPBx7YL3AWQi+UF7CXXfMW/b6buom+Tc3UqHB+1+jze5yu/LZjo2ilDyWGKNGfrwjin0SUhu9qk0H3fvo8G4UwCMqO8qJfPVD1bDERtRHOG2b9N+Fzmqp86BBj+xaNTVXjLTSrMFd8m8I3TcpGGhUBX54IrOJxSW54qBS0juCHada/jMIlUJXABCOXSiuRavxSa9EEUqUuDdvFBUax0DjzcGl0xEd8/I4/EW7+bdjXnsPzqyFub+TWml32K8dUdbTKXayKjlBYEh9WVssc3OHwPASNqjadgRP//EYOozvw43kbXNLjVAJS7mXHNSYDDX8Pd3te2hhq7YuOo5wvVbxNyhg0L0vS6Gn9eH7qYaTsCJhr2f8M4+k7qdNvIG/2SOjjU0hTcQkkfpf07FRyi5t7upAyl3TUVyShOmkQzgsOQFDe7Vbb/Nns97icxQ9poItsFzC5aQ==|920 \ No newline at end of file diff --git a/ServerCommands/任务/修改任务预算工时.json b/ServerCommands/任务/修改任务预算工时.json index 8a0cf35a..fcd28242 100644 --- a/ServerCommands/任务/修改任务预算工时.json +++ b/ServerCommands/任务/修改任务预算工时.json @@ -56,6 +56,14 @@ }, "ColumnName": "项目ID" }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "b3058106-27e3-4405-825a-c6317d65dbba" + }, + "ColumnName": "父任务ID" + }, { "BindingInfo": { "TableName": "任务表", @@ -87,7 +95,60 @@ }, "TopCount": "1" }, - "ID": "e249fcc1e8314d89994ed379114805fb" + "ID": "2b57c3279a694782aa04fa8d1ecdb672" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目统计", + "TableValue": { + "TableName": "View_项目统计信息", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "e2c10b48-d276-43ff-92d3-6982554995d3", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "严格模式" + } + }, + "ColumnName": "严格模式" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算工时", + "GUID": "df4b665e-bf05-415f-b1d6-44ef6268356f" + }, + "ColumnName": "项目预算工时" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "已分配任务工时", + "GUID": "e0b92957-2058-4acf-8f85-c8cb21e7751c" + }, + "ColumnName": "已分配任务工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "a21318d5-5050-4baa-a025-483041bba932" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.项目ID" + } + }, + "TopCount": "1" + }, + "ID": "4d7974b85a6845abbf13a6049e366122" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -99,249 +160,235 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表" + "SerializeProperty": "=项目统计.严格模式" } }, - "value": "%Null%", - "compareType": 1 + "value": "1" }, "CommandList": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目统计", - "TableValue": { - "TableName": "View_项目统计信息", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目ID", - "GUID": "8be465f9-1173-4551-ba9c-8077e9e1068a", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "严格模式" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.父任务ID" } }, - "ColumnName": "严格模式" + "value": "%Null%" }, - { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目预算工时", - "GUID": "c3f88088-ff8f-4ba4-b4b8-0b9b680f51b1" - }, - "ColumnName": "项目预算工时" - }, - { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "已分配任务工时", - "GUID": "239a7f3e-877a-4045-ba12-838408b52584" - }, - "ColumnName": "已分配任务工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目ID", - "GUID": "f6308398-2aec-4b4a-9e2a-ec524facb605" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.项目ID" - } + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "预算工时上限", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目统计.项目预算工时-项目统计.已分配任务工时-任务表.任务预算工时" + }, + "ID": "b20c1c796f94456fa4c385c315a4cdda" + } + ], + "ID": "52853e08-03e3-452c-a809-3fb79bd21885" }, - "TopCount": "1" - }, - "ID": "66c3b6d4cc42478aaa57db9f14eade1e" + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "父任务", + "TableValue": { + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "层级", + "GUID": "71447dd9-ed15-40d3-8c95-35af02be1228" + }, + "ColumnName": "层级" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "f2ea1508-f30e-412f-a345-3ede9d6c420d" + }, + "ColumnName": "任务预算工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "总计划工时", + "GUID": "1d7f0d26-c3c4-4fd5-9d35-d8c6775d2e75" + }, + "ColumnName": "总计划工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "a11173ee-ce04-46d5-a2fe-57bac8f3d19f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.父任务ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "aa8c47d4b5eb4239af91776e1e32a8cb" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "预算工时上限", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务.任务预算工时-父任务.总计划工时--任务表.任务预算工时" + }, + "ID": "cb9ee25307d1485c8e3ac45336def641" + } + ], + "ID": "1e3945ac-3720-41d8-bcdf-ed397bcedcf8" + } + ], + "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计.严格模式" - } - }, - "value": "1" - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新预算工时" - } - }, - "value": "0", - "compareType": 2 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计.已分配任务工时-任务表.任务预算工时+新预算工时" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计.项目预算工时" - }, - "compareType": 2 + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算工时上限" } - ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新预算工时" + }, + "compareType": 4 }, "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "任务预算工时超标，请修改或申请新的预算。", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(父任务ID>0,\"预算工时超标：父任务可只配计划工时不足，请修改后提交！\",\"预算工时超标：项目可只配计划工时不足，请修改后提交！\")" + }, "CustomReturns": [ { - "ReturnPropertyName": "新工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.任务预算工时" - } + "ReturnPropertyName": "新工时" } ] } ], - "ID": "5e2aa6a9-e408-44f0-90f1-e11fdb5270b7" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "36cde956-3506-4020-942d-ca6bb7016a8e" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务ID" - } - }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务预算工时", - "GUID": "b78102b7-bcdb-4145-a54e-46accc090b40" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新预算工时" - } - } - ], - "ParamNameToSaveNewRowValue": "新任务" - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "3dfb20d5-c014-4d00-b1fd-f84951a03919" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.项目ID" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "f026ebd2-95a1-4077-8e6c-e883138826b1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"调整了任务[\"&任务表.任务名称&\"]的预算工时\"" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "cd4d5d5b-62f7-4c11-916d-96c05c629d09" - }, - "Value": "%CurrentUser%" - } - ] - } - ] - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "新增成功", - "CustomReturns": [ - { - "ReturnPropertyName": "新工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新预算工时" - } - } - ] - } - ], - "ID": "c21c7ff8-478e-446d-af98-6e5ab1bd0d2d" - } - ], - "Comments": "如果任务设置了预算工时，则检测是否超标" - } - ], - "ID": "630ad741-4de8-48aa-8b47-71f462d8aa63" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "任务不存在", - "CustomReturns": [ - { - "ReturnPropertyName": "新工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务表.任务预算工时" - } + "ID": "c667d961-bb93-499b-9e03-482f4d1f115a" } ] } ], - "ID": "4258f225-dd00-46aa-a4b9-38208b689ff6" + "ID": "275a2a65-0549-49f3-99d0-862677c550f5" + } + ] + }, + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "36cde956-3506-4020-942d-ca6bb7016a8e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "e283365a-ac2d-4c9e-90f5-92658dc5d899" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新预算工时" + } + } + ], + "ParamNameToSaveNewRowValue": "新任务" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "01da9d3d-946f-4118-8d88-5349a0502f34" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务表.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "d7d7c0ba-fafc-4c3d-90b5-da4cd5d222f9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"调整了任务[\"&任务表.任务名称&\"]的预算工时\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "02e1aaae-adfd-4e74-936f-966d7d6bc110" + }, + "Value": "%CurrentUser%" + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "新增成功", + "CustomReturns": [ + { + "ReturnPropertyName": "新工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新预算工时" + } } ] } diff --git a/ServerCommands/任务/新增任务.json b/ServerCommands/任务/新增任务.json index f406f575..efc9f459 100644 --- a/ServerCommands/任务/新增任务.json +++ b/ServerCommands/任务/新增任务.json @@ -132,7 +132,7 @@ }, "TopCount": "1" }, - "ID": "89a933bed8a0415093c1ca7e65863c02" + "ID": "b20694e9a4684d6bb38f4af5104fe73a" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -144,11 +144,10 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计" + "SerializeProperty": "=项目统计.严格模式" } }, - "value": "%Null%", - "compareType": 1 + "value": "1" }, "CommandList": [ { @@ -156,360 +155,355 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计.严格模式" - } - }, - "value": "1" - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算工时" - } - }, - "value": "0", - "compareType": 2 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计.已分配任务工时+预算工时" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目统计.项目预算工时" - }, - "compareType": 2 + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务ID" } - ] + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "预算工时上限", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目统计.项目预算工时-项目统计.已分配任务工时" + }, + "ID": "9dce806ffef440e7b85e5861422b0269" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "层级", + "ParameterValue": "1", + "ID": "289bf7d065ed4d829192ec2cfcd1aff9" + } + ], + "ID": "e061f809-9278-416a-b480-aef74ad8caeb" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "父任务", + "TableValue": { + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "层级", + "GUID": "71447dd9-ed15-40d3-8c95-35af02be1228" + }, + "ColumnName": "层级" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "f2ea1508-f30e-412f-a345-3ede9d6c420d" + }, + "ColumnName": "任务预算工时" + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "总计划工时", + "GUID": "1d7f0d26-c3c4-4fd5-9d35-d8c6775d2e75" + }, + "ColumnName": "总计划工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "a11173ee-ce04-46d5-a2fe-57bac8f3d19f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "0cb2c214b7bd4342b32ca610904d9cd0" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "预算工时上限", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务.任务预算工时-父任务.总计划工时" + }, + "ID": "fb21eb10cb6c45faa4f7f1f93def7cf5" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "层级", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务.层级+1" + }, + "ID": "cbfea9db3fa545839e30188fb7c9dfba" + } + ], + "ID": "c3e2ff5b-e415-43d0-b7c7-079efdaeeaed" + } + ], + "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算工时上限" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算工时" + }, + "compareType": 4 }, "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "任务预算工时超标，请修改或申请新的预算。" + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(父任务ID>0,\"预算工时超标：父任务可只配计划工时不足，请修改后提交！\",\"预算工时超标：项目可只配计划工时不足，请修改后提交！\")" + } } ], - "ID": "c34452bd-96e1-4411-be79-24f1fdab9459" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=父任务ID" - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "层级", - "ParameterValue": "1", - "ID": "b16d29a07b0c438fbbb99f78efd15b82" - } - ], - "ID": "cdd0d56f-8d1c-47da-9f46-0dc7557e3e4d" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "父任务", - "TableValue": { - "TableName": "任务表", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "层级", - "GUID": "71447dd9-ed15-40d3-8c95-35af02be1228" - }, - "ColumnName": "层级" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "a11173ee-ce04-46d5-a2fe-57bac8f3d19f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=父任务ID" - } - }, - "TopCount": "1" - }, - "ID": "a739bad14f7e43d0bfa3c64950d43eed" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "层级", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=父任务.层级+1" - }, - "ID": "94dddad10a1647e3906a84c6cf0793dc" - } - ], - "ID": "b1ec1f65-b9b5-409f-981b-514b838ecbec" - } - ] - }, - { - "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "d1ce9d9b-3111-45d3-86cb-9d2d13ca96a9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "父任务ID", - "GUID": "663b0fd7-aeaf-45bd-9bd8-5081460bf68b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=父任务ID" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务名称", - "GUID": "8f65568f-c2bf-47dd-a801-33660d2d3b1e" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务标题" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "执行者", - "GUID": "cd0b6e71-917b-4141-97fa-759aee7d60dc" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行人" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "开始时间", - "GUID": "3c7c2bda-50f9-428a-a444-c72e4ab3bba8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开始日期" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "结束时间", - "GUID": "10d5a495-3443-43f1-814a-7b26b663a59b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=结束日期" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务类型", - "GUID": "7182f12f-6e4a-456f-93dd-259034437aec" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务类型" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "分组ID", - "GUID": "30b21965-c8f2-446f-b463-fd5acbe18fad" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务分组" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "版本", - "GUID": "00196d28-a6a3-41b9-b4ff-96e22d2908d2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务版本" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务说明", - "GUID": "b5c7d432-0b10-4fd8-a018-59dda1fa58bd" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务说明" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "备注", - "GUID": "d16f82bf-c2b1-45e1-a6e7-09ec92385858" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=备注" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "层级", - "GUID": "85f9bb94-726b-45d3-a097-0e26e70a57db" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=层级" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务预算工时", - "GUID": "06ca0878-5d0b-4450-8d58-d0a598927853" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算工时" - } - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "3f066ba2-b601-4a29-a83b-d0c77ac63dc7" - }, - "Value": "0" - } - ], - "ParamNameToSaveNewRowValue": "新任务" - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目动态", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目ID", - "GUID": "10414937-35a4-4c78-88ee-573c87c57613" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "项目动态", - "GUID": "78700379-81df-4091-a3c0-c0ce09788052" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"新增任务[\"&任务标题&\"]\"" - } - }, - { - "BindingInfo": { - "TableName": "项目动态", - "ColumnName": "执行人", - "GUID": "2a010c61-4894-4c8f-9e2c-3a7d6c7eee3c" - }, - "Value": "%CurrentUser%" - } - ] - } - ] - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "新增任务成功，请添加参与人和设置人员岗位、薪资等信息！" - } - ], - "ID": "bfea1c53-d963-4a65-9bf7-f3f7d4bcbe2c" + "ID": "664e3f3e-0afe-4f14-9aa0-3deb8ee1c12b" } - ], - "Comments": "如果任务设置了预算工时，则检测是否超标" + ] } ], - "ID": "5d3bd8b4-c692-4b38-ad2d-cfa994a0e420" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "项目不存在" - } - ], - "ID": "00cae617-053f-407e-9436-464e88870862" + "ID": "a7c14fc3-d8ac-4e4b-a907-45e333a5524e" } ] + }, + { + "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "4891d943-994f-4cfc-be42-63246917534c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "048785f7-9c18-48ce-8282-5739f8355965" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务ID" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "30d333e4-7d0e-4b8f-a568-75ce9621d7be" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务标题" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "执行者", + "GUID": "03acb5a3-823a-4e68-9303-4aa11489fc86" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "开始时间", + "GUID": "fd5fb34e-2fc6-4663-bdbd-a31c0463fe22" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开始日期" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "结束时间", + "GUID": "4b057191-223f-4331-93ec-5af229c53287" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=结束日期" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务类型", + "GUID": "eb45fdd2-bd5e-4d65-b9e7-8df8e44de323" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务类型" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "分组ID", + "GUID": "3a46616c-aa5a-4982-a643-73f7ee4144cb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务分组" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "83a5b992-e679-46dd-a82c-4982198d8c8b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务版本" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务说明", + "GUID": "2d46c561-1de3-4c23-930b-54b10720dafd" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务说明" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "备注", + "GUID": "754d3dc4-bc47-4f39-a088-11a53e96f150" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=备注" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "层级", + "GUID": "b2a9059f-0224-4121-9d31-73dc724f7190" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=层级" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "20ac10c7-62de-47e9-9be1-4395796d3279" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算工时" + } + }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "6eefaa67-0a7b-4214-90f3-11e0fe79ae51" + }, + "Value": "0" + } + ], + "ParamNameToSaveNewRowValue": "新任务" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "017d289e-78e0-4eaa-89e8-0d3cfbf57d60" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "f351575c-6a88-4d02-bc3c-4fa73691434d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"新增任务[\"&任务标题&\"]\"" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "3bb8e80c-258e-4d88-8554-bad92a4020bb" + }, + "Value": "%CurrentUser%" + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "新增任务成功，请添加参与人和设置人员岗位、薪资等信息！" } ] }, diff --git a/Tables/项目/项目任务树视图.json b/Tables/项目/项目任务树视图.json new file mode 100644 index 00000000..349722bc --- /dev/null +++ b/Tables/项目/项目任务树视图.json @@ -0,0 +1,51 @@ +{ + "Name": "项目任务树视图", + "Columns": [ + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "varchar", + "MaxLength": -1, + "Name": "类型", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "PID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "名称", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + } + ], + "ExternalDatabaseInfo": { + "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "ConnectionId": "业务表", + "SourceTableName": "项目任务树视图", + "SourceTableSchema": "dbo", + "CreateViewSql": "SELECT\r\n[类型] ='项目',\r\n[ID],\r\n[PID]=NULL,\r\n[项目名称] AS [名称]\r\nFROM 项目表\r\n\r\nUNION ALL\r\n\r\nSELECT\r\n[类型] ='任务',\r\n[ID],\r\n[项目ID] AS [PID],\r\n[任务名称] AS [名称]\r\nFROM 任务表", + "ViewInfo": { + "ViewName": "项目任务树视图", + "IsUpdatable": true, + "QueryColumns": [ + "类型", + "ID" + ] + } + }, + "Indexes": [] +} \ No newline at end of file