diff --git a/.collaboration b/.collaboration index 6f40e585..5630e7c0 100644 --- a/.collaboration +++ b/.collaboration @@ -163,16 +163,7 @@ }, { "ModuleName": "Table/项目岗位", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:54:17.1792115+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目岗位.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目版本", @@ -180,16 +171,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:05:34.3468628+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目预算变动表", @@ -205,31 +187,11 @@ }, { "ModuleName": "PCPage/修改报工", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:43:47.3900808+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\修改报工.json", - "Pages\\任务\\工时\\修改报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:41:51.64732+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\新增报工.json", - "Pages\\任务\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -413,17 +375,7 @@ }, { "ModuleName": "PCPage/FGC_任务详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:04:02.9930324+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_任务详情.json", - "Pages\\流程页面文件夹\\FGC_任务详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_审批记录", @@ -531,17 +483,7 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T16:02:34.5754048+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目甘特图", @@ -557,17 +499,7 @@ }, { "ModuleName": "PCPage/项目信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:11:20.7698975+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目信息.json", - "Pages\\项目\\项目首页\\项目配置\\项目信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目列表", @@ -575,17 +507,7 @@ }, { "ModuleName": "PCPage/项目审批", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:07:14.5237909+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目审批.json", - "Pages\\项目\\项目首页\\项目配置\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目标题", @@ -645,16 +567,7 @@ }, { "ModuleName": "ServerCommand/新增工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T14:58:23.5133177+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\新增工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/项目", @@ -672,19 +585,6 @@ "ModuleName": "ServerCommand/批准项目预算申请", "ModuleType": 15 }, - { - "ModuleName": "ServerCommand/新增项目", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:11:20.7694946+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\新增项目.json" - ] - }, { "ModuleName": "ShareCommandContainer/发起预算申请", "ModuleType": 36 @@ -695,17 +595,7 @@ }, { "ModuleName": "ProcessItem/立项流程", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:11:54.1823178+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\立项流程.json", - "Process\\立项流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/预算申请", @@ -885,33 +775,11 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:27:17.3449964+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T16:03:44.030679+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\echart.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -931,27 +799,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T16:35:01.3556642+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Microsoft SQL Server-10_0_0_0.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\PC组件包-ElementPlus-10_0_0_0.zip", - "Plugin\\加载动画-10_0_0_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\富文本编辑器-10_0_0_0.zip", - "Plugin\\支持预览的附件上传-10_0_0_0.zip", - "Plugin\\甘特图-10_0_0_0.zip", - "Plugin\\用户管理命令 V2-10_0_0_0.zip", - "Plugin\\自定义菜单类型和树类型-10_0_0_0.zip", - "Plugin\\设置当前行命令-10_0_0_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1011,17 +859,7 @@ }, { "ModuleName": "PCPage/任务成员详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:31:29.5066405+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务成员详情.json", - "Pages\\任务\\任务成员详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/修改任务预算工时", @@ -1029,17 +867,7 @@ }, { "ModuleName": "PCPage/项目成员详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:30:18.1729303+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目成员详情.json", - "Pages\\项目\\项目成员详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位详情", @@ -1079,12 +907,6 @@ }, { "ModuleName": "ServerCommand/新增或修改项目", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-08T15:11:20.7694989+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/任务/任务成员详情.json b/Pages/任务/任务成员详情.json index 7a4dead2..bd11c2b9 100644 --- a/Pages/任务/任务成员详情.json +++ b/Pages/任务/任务成员详情.json @@ -159,6 +159,7 @@ "1,1": "成员", "4,1": "岗位", "7,1": "任务时薪", + "7,14": "*优先级最高，不设置将会采用项目岗位中的设置", "11,1": "取消", "11,12": "保存" }, @@ -391,12 +392,12 @@ ] } ], - "ID": "44b5a9c0-d091-4542-928d-27e122fc99de" + "ID": "664687ee-0153-44b9-a5e8-389f9703d343" } ] } ], - "ID": "c4941293-b5ce-4e19-b61f-22f5d21bf0e6" + "ID": "84bca582-241e-4409-aa63-940ab91e07e4" } ] } @@ -620,7 +621,7 @@ "CheckDataValidation": false } ], - "ID": "15838424-b188-48d0-922e-216da4efcb79" + "ID": "53b6a3e4-6eee-4f96-9a92-d43a9d420f91" }, { "CommandList": [ @@ -630,7 +631,7 @@ "ShowConfirm": false } ], - "ID": "4e3bbfbe-6bdf-4dac-8235-88e72c80eeb3" + "ID": "bc7ea7a7-56e5-43aa-a016-4afc95dfe015" } ] }, @@ -651,7 +652,7 @@ ] } ], - "ID": "3709642e-dc20-43a6-8451-9b77c8e1e07d" + "ID": "3db8f529-f299-40e1-9987-ee618f967b85" }, { "CommandList": [ @@ -661,7 +662,7 @@ "Message": "请指定项目和任务" } ], - "ID": "725bf8f1-5861-4658-8dc3-45bcf2a6e116" + "ID": "bdee276a-7ae9-464d-858d-2743af84f79f" } ] } @@ -703,11 +704,17 @@ "FontFamily": 0, "FontSize": 13.333333333333332 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 2, + "HorizontalAlignment": 3 + }, { "BorderBottom": 0 }, { - "Background": 3, + "Background": 5, "BorderBottom": 1, "BorderTop": 1, "BorderLeft": 1 @@ -722,7 +729,7 @@ "BorderRight": 1 }, { - "Background": 3, + "Background": 5, "BorderBottom": 1, "BorderTop": 1 }, @@ -734,16 +741,18 @@ "Strs": [ "Body", "[AUTO]General", + "Text 1 50", + "Right", "Background 2 0", "#FFFFFF00", "black" ], "Borders": [ { - "Color": 2 + "Color": 4 }, { - "Color": 4 + "Color": 6 } ] }, @@ -802,46 +811,46 @@ "7,11": 1, "7,12": 1, "7,13": 1, - "7,14": 1, + "7,14": 2, "7,15": 1, "8,0": 1, "8,1": 1, "8,15": 1, - "9,1": 2, - "9,2": 2, - "9,3": 2, - "9,4": 2, - "9,5": 2, - "9,6": 2, - "9,7": 2, - "9,8": 2, - "9,9": 2, - "9,10": 2, - "9,11": 2, - "9,12": 2, - "9,13": 2, - "9,14": 2, + "9,1": 3, + "9,2": 3, + "9,3": 3, + "9,4": 3, + "9,5": 3, + "9,6": 3, + "9,7": 3, + "9,8": 3, + "9,9": 3, + "9,10": 3, + "9,11": 3, + "9,12": 3, + "9,13": 3, + "9,14": 3, "11,1": 0, "11,2": 1, "11,3": 1, "11,12": 0, "11,13": 1, "11,14": 1, - "13,0": 3, - "13,1": 4, - "13,2": 4, - "13,3": 5, - "13,4": 6, - "13,5": 4, - "13,6": 5, + "13,0": 4, + "13,1": 5, + "13,2": 5, + "13,3": 6, + "13,4": 7, + "13,5": 5, + "13,6": 6, "13,7": 1, "13,8": 1, "13,9": 1, - "13,10": 7, - "13,11": 7, - "13,12": 7, - "13,13": 7, - "13,14": 7 + "13,10": 8, + "13,11": 8, + "13,12": 8, + "13,13": 8, + "13,14": 8 }, "SheetStyle": { "FontFamily": 0, @@ -904,4 +913,4 @@ "Formula": "任务成员详情!$N$14" } ] -}//rZhvVMHGtVa12Z7OAwnT0fFTiGrh3KYdofhkeUEQfP6BcZBeIGfI8CJT8oz9OLK/Jv9/yKiM+AkcyyUy/6NVzpkxwiU+QDAvcwPs/5lLXAJ8eFCRqND4C1J+j8D+hE56TKsby1+BA1LwUVSR+N9laiAhAmBtLYbmKl9FE0+dPnzqTzJIQZtocJl+qeLDr6yBffnfoYQoVJfF09tbLG9AHNPgLPrXdLfF47nAdxRSis6pZhb9NMZaqqTTWhcWpF6ZX8qpiyZOToyvqoE2wYSxgEKtfwNt9ITL0KONDN+DrAc8fiv436ZNDOK7NZGcNp5bikE7UYqfcKRoKrimQRBbva9aDJvkvFiIdxuxqz0KT5kOV4WCXZqzMrHhcysP9dXlRGFw5vFPJSf70hpFWLvXx+nPcU6TeSnqCQP+pfMSGRTBcVLu8+TUtPRS+pdMwJPKUJTAv+ZyFevLDbYAdPfN8hQlDBlA8RG3RhIsLSJ8otvSb2flq5ZVcXPiQUASnPf6Xay7t3NFTKt85fS2ddtBkbeyCx7+mkCcIYpGldvBoqzBnfXWP10HKnacvcmX9FxzuHwzpMoTZiRGpxpLxEKzoADrg+xEspDHbmXz45Pouupf9jW6bMkB+cJRVPfz5QFZwb2nyguAfu4Iq0FsVHUKSFFgxe26fe1CdWP7nDf3tYrmVYGxoAq+tG1qSKH6sh4fyAkcui9QVoVpvSvWpepd6/+M6rxET9QNjK95MZ7D6roeDdwPLKq/0eTwc3bf1uwqN+Oai11EX2vPsjMZ2n8Rtqca/MvoCGeFvlaWhq0FpU2wWy+9A64wvOjO3a6tcivHZTkVDJsALw9R16af8Y/Qkn3HkAVcfx1za6NoxFP1m/pFDrvwOVsPSyisEnv56yi+dlsl4bA80INN7Uso6W/aow==|920 \ No newline at end of file +}//WDyrHqSEKbZYYq+WBr5qLmS+2TjDUqaOVuJtAQZzFvMcV1jn2BXZknwHz+Ib8GQ1TaGjny/6EuIxNCr2GfD7ytGpzTHnk5p4WZ95cnZq8HL0Hopd82KTYYovjGCeESTwwTIr5QDBGPE/hWC2kZGSRo9pNmKOjddu85xHeJeySyygNvHOp2Spatm2yTHbARWHl8pJ2Z2loNyQovJkeVjlUH167Km/bgeDel8O11BKQ+rEhKNfK0NR/lRds2Stfh/n56S05kfAUw8ETitCayKfurQP5IdYUKSJh2h5hvx0SWFDNkDm59f6kyfqNPlJZVfaY5RUWHYES1qD7Vy3ZIh63UoLw6u55Png6kz5RM9b7SeA/IQvXaS967KsvVsphNJArdoapZIOK+ec+RYtsg64usD8isppnJzOwzZd49H7iJtsQw5/uhc7i9UWE2+UqJMcPk4eXI13s5xkcugVrmK4NIY/6oLeAL8AB2xdyu/vaIkQZ9jAaXF8CA3/cg5kNf/Va6ElA439lBYqfCm0ZsilUFsO7WJUxTrej5wFp3BU6nE6RJyVvyI+GxWIvsfAJ+pdgbL6lBY3BTO4nBoZV2gJuZCyrXkr9zIjaOmehbG/hhDQSHhhWl1SIZ4QnirVz9zt+fpfPj+If2vye/vlurPzziTz5MkHQpUEX9v8KMAoNELh1w9Q9i78TnvASnVjHUEGwK0O2faWS0+PcLkm0IPrmnAW4SAjdWjWcoFaBL9JfAjO3XemfnLyQEhZH0pUh9PoriY3/I1RVfVnCHYTcTPjqEtF6c2HwLjd33YZneIEiGOnSBXwLnQX3Qt+yaYI0OgYZV+SeHQHu3hzr4QYKZov5Ca97ObTFMZiIWAkK+VdpvE5ET1J0nruRRK2ojKfJ1B4zm7QhD6++I2Iydn2ziHgdQ==|920 \ No newline at end of file diff --git a/Pages/任务/工时/修改报工.json b/Pages/任务/工时/修改报工.json index b6c48db9..04198b03 100644 --- a/Pages/任务/工时/修改报工.json +++ b/Pages/任务/工时/修改报工.json @@ -28,23 +28,14 @@ }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 10.0, + "IsHidden": true } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 177.0 - } - }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 12.0, - "Mode": 1 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 35.0, + "IsHidden": true } }, "14": { @@ -54,12 +45,13 @@ }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 177.0 } }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 12.0, + "Mode": 1 } }, "17": { @@ -68,12 +60,32 @@ } }, "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "22": { "GridRowColumnDefinition": { "DesignLengthInPixel": 27.0, "IsHidden": true } }, - "19": { + "23": { "GridRowColumnDefinition": { "DesignLengthInPixel": 27.0, "IsHidden": true @@ -81,10 +93,14 @@ } }, "InLogicalVisibleIndexes": [ - 18, - 19 + 8, + 9, + 10, + 11, + 22, + 23 ], - "Count": 20 + "Count": 24 }, "Cols": { "RowColumnAttachedInfos": { @@ -186,9 +202,10 @@ "1,1": "工时执行者", "1,10": "执行时间", "5,1": "实际工时数", - "9,1": "工作进展", - "16,1": "取消", - "16,14": "提交" + "9,1": "任务时薪", + "13,1": "工作进展", + "20,1": "取消", + "20,14": "提交" }, "AttachInfos": { "3,1": { @@ -271,7 +288,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=修改报工!E19" + "SerializeProperty": "=修改报工!E23" } }, "CustomColumns": [] @@ -360,12 +377,50 @@ }, "DataValidationInfo": { "NumberType": 2, - "FirstParamValue": "0.1", - "SecondParamValue": "9999", + "CompareParamType": 4, + "FirstParamValue": "0", "IgnoreBlank": false } }, "11,1": { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "时薪单价", + "GUID": "4e547d57-9679-44cc-a864-6d0c08cbe7d2" + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "Enabled": true, + "AllowRoles": [ + "项目总监" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "min": "0.1", + "max": "99999", + "step": 1, + "precision": 1, + "placeholder": "请输入", + "controlsPosition": true + }, + "DataValidationInfo": { + "NumberType": 2, + "CompareParamType": 4, + "FirstParamValue": "0", + "IgnoreBlank": false + } + }, + "15,1": { "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", @@ -399,7 +454,7 @@ "resize": "none" } }, - "16,1": { + "20,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -411,7 +466,7 @@ "TemplateKey": "_RS_Information3" } }, - "16,14": { + "20,14": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -461,7 +516,7 @@ "ParamName": "新进展内容", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=修改报工!B12" + "SerializeProperty": "=修改报工!B16" } } ], @@ -508,7 +563,7 @@ "ReloadData": true } ], - "ID": "ccff74b9-c145-4a92-8ba8-acc3d497819e" + "ID": "8525f26d-b11a-4a7e-a860-13c7aeba0e58" }, { "CommandList": [ @@ -523,7 +578,7 @@ "BtnText": "知道了" } ], - "ID": "0d1c4acf-195d-4fe7-93eb-e1b24a8f2ced" + "ID": "441b87a5-9db9-4f9c-96c6-38796d1b54c2" } ] } @@ -532,14 +587,14 @@ "TemplateKey": "_RS_Main1" } }, - "18,1": { + "22,1": { "BindingInfo": { "TableName": "任务工时表", "ColumnName": "ID", "GUID": "273b793f-e407-477c-bc6f-0c946105d9f6" } }, - "18,4": { + "22,4": { "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", @@ -636,7 +691,7 @@ "8,16": 2, "8,17": 2, "9,0": 2, - "9,1": 1, + "9,1": 3, "9,2": 2, "9,3": 2, "9,4": 2, @@ -673,7 +728,27 @@ "10,17": 2, "11,0": 2, "11,1": 2, - "13,1": 2, + "11,17": 2, + "12,0": 2, + "12,1": 2, + "12,2": 2, + "12,3": 2, + "12,4": 2, + "12,5": 2, + "12,6": 2, + "12,7": 2, + "12,8": 2, + "12,9": 2, + "12,10": 2, + "12,11": 2, + "12,12": 2, + "12,13": 2, + "12,14": 2, + "12,15": 2, + "12,16": 2, + "12,17": 2, + "13,0": 2, + "13,1": 1, "13,2": 2, "13,3": 2, "13,4": 2, @@ -690,31 +765,68 @@ "13,15": 2, "13,16": 2, "13,17": 2, - "14,1": 4, - "14,2": 4, - "14,3": 4, - "14,4": 4, - "14,5": 4, - "14,6": 4, - "14,7": 4, - "14,8": 4, - "14,9": 4, - "14,10": 4, - "14,11": 4, - "14,12": 4, - "14,13": 4, - "14,14": 4, - "14,15": 4, - "14,16": 4, - "14,17": 4, - "16,1": 5, - "16,2": 2, - "16,3": 2, - "16,14": 2, - "16,15": 2, - "16,16": 2, - "18,1": 6, - "18,4": 6 + "14,0": 2, + "14,1": 2, + "14,2": 2, + "14,3": 2, + "14,4": 2, + "14,5": 2, + "14,6": 2, + "14,7": 2, + "14,8": 2, + "14,9": 2, + "14,10": 2, + "14,11": 2, + "14,12": 2, + "14,13": 2, + "14,14": 2, + "14,15": 2, + "14,16": 2, + "14,17": 2, + "15,0": 2, + "15,1": 2, + "17,1": 2, + "17,2": 2, + "17,3": 2, + "17,4": 2, + "17,5": 2, + "17,6": 2, + "17,7": 2, + "17,8": 2, + "17,9": 2, + "17,10": 2, + "17,11": 2, + "17,12": 2, + "17,13": 2, + "17,14": 2, + "17,15": 2, + "17,16": 2, + "17,17": 2, + "18,1": 4, + "18,2": 4, + "18,3": 4, + "18,4": 4, + "18,5": 4, + "18,6": 4, + "18,7": 4, + "18,8": 4, + "18,9": 4, + "18,10": 4, + "18,11": 4, + "18,12": 4, + "18,13": 4, + "18,14": 4, + "18,15": 4, + "18,16": 4, + "18,17": 4, + "20,1": 5, + "20,2": 2, + "20,3": 2, + "20,14": 2, + "20,15": 2, + "20,16": 2, + "22,1": 6, + "22,4": 6 }, "SheetStyle": { "FontFamily": 1, @@ -722,17 +834,71 @@ } }, "Spans": [ - "16,1,1,3", + "20,1,1,3", "3,1,1,7", "3,10,1,7", - "16,14,1,3", + "20,14,1,3", "7,1,1,16", - "11,1,2,16", - "18,1,1,3", - "18,4,1,3" + "15,1,2,16", + "22,1,1,3", + "22,4,1,3", + "11,1,1,16" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon", + "currentUserProperty": { + "UserProperty": "角色", + "PropertyType": 3 + } + }, + "value": "项目总监", + "compareType": 10 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=修改报工!9:12" + }, + "Value": true + } + ] + } + ], + "ID": "c3668a77-2e99-4ad0-98a1-a36780c7d885" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=修改报工!9:12" + }, + "Value": false + } + ] + } + ], + "ID": "c1b24b1d-391c-4ab7-8fe5-c6c0279df6e4" + } + ] + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -758,7 +924,7 @@ "CustomNames": [ { "Name": "报工ID", - "Formula": "修改报工!$B$19" + "Formula": "修改报工!$B$23" } ] -}//JbGDtCPSJJLTZVFl7So5rdOeXWJd2c2eBmDlBhSMFpnQ2Q280uIIvHQhGS+/YyOPoWpO5y8pOcH5uP4EohsRVtOKwaAYYg1ufxF47FsgLGcVwg4MEcg/NyzuAIia28JSCikjY5iTgol+OytPYDhh64bs4jJGxJgH+ELzL55E6KykRWAR8477rQN7D9Sd0ReTY+r+sJ0n3M0voJIIOdsEEacEKEs3lS3iYKxRXWvArd8ucYPUqkYX1X0NKSWRwkNs/xgW2/2XJ4iwgPtdrAwFtNcgqVxhQU0KYnpJeHEwwtNIWxSC/t5fdFGQzO09nFiLqKlnH4DSa9eVHxi6cM2pq11yM9xrmXtAUzsc9XhNIXSuaqNR6iIcVS5gtxj7PAnSpPOZoKBJY9q+MMhu8b+eqUYtg8VDtQJeRwm05dmNiWX9fq4HbzSEuXFxB/dVs6JxuwCfQwMzWkf9dYfxVOxFJf4TrHnHPXn2UbWZKkh36VjjltIs58/Ljnt4V3RDrA3MGO9EP+SZ/RAw/wpdJGM1s9c2d5mMFnFp/PoCmABVHS6LSigAiqZ8BHqgodFRYIJbvdHk2cUjw7wmwVyJcNN6G752/camwLWY5RFZw9fw1aWSc3KrWG9Ief/JzUxQOvw9YhLIBbYBoorAoMqvFTj8wAYaaoREAwC05Xn+u0AmDsTuRUb5+8ouYCOYDkGZol47K2uyl4WlTEMJuVLa569M8vhxSRNJCn7h6r+NmjDVESlJ1GNkzBzCjsdgIkBwb+0Z3U4wOUPtHs45jdbGnA8M2giEnNQ9RCmZ+z8qY3VgfUfMYJ2gzCqrqP2ja9Vj6xDzInLQCHhIXDIq0VUaGg38yNMGtOWhDYZtH0/Byac7CIeg3bWz2M1T4HxKOXvYuazUp3MNHHK1tGI9GIih1FcsXA==|920 \ No newline at end of file +}///zqoX+hScm+UcET/vO/3eChuTSfEEFQMSAv18fneBmrNEDsL3kjKiorzO28iN04CBGjNrNoH76WdFnNWjkfRATVKZnEbfm31IDuAvRkAytPB7EUQ91843uRPdBPXo+0R8NW7i32ocC+So9WNWgvdAfpJPItCBvHx1kD5JtNCY0jSXmQy3s8cfWMPhm8b7tyyzvi3O4SMT/QvP50DnA50gEDxPmI1TA8bOKLeo1XAMWWwAptAsyl+bnD4vfAvsZwjX1C95IAV/vS7CrnZcn6xxjxLXpa5n7GvbcwZ8Sqd8Kr1KB0DPqHI/QO5Ta8XN8bIV6UziGIPa56uAy4DioxjpKuVkjtZR10QGxtcWU4u8qEc24y9YPdyvl0tgu8+f+MmSfTF/a0ziJp6QrDCVhMuxQuJbPMzNSi1rtZ+pOsxG7mgYmaDF5x1GnZj15jxzJM2oynLyJ3Q9vaQfR7R49WQ3rtzMcvJD9EL8ipAAzX8rDINEBAdNv7hNhuJ7Y2yhw89BHD9zmcVKiq2/Zb80qDB4AVq1o0o/XAMi3pIBxA55kvJaHt7G+L9+cMfmU+KUjcC3zHTXR0AdoUEtn83JAJZ9NH5ldYzq9uE+NCM0wjhLtNx0pTmCMIqVaDZLqsBp0Kh1z1jEwZfdzuVprazllSH/A/hPJEhPCGnk7not1TyN9YeL0YR8ws5U/w9YTXTRtgFAhIek0EBNhyKY4U9OcXu/bGCqfLSuZhUU14tK8ghyrKl32kc7BE5Q+zy7a7Nweij963sKuG/44OtQNYEt5r/cEaLNHXOiOLQ0TRXxM3BaKKY/MrEoeuGNPTmXd59Wg0WAZvjET6M+s2DHObHCjNylT6yZ4dt/GbQFkwz9jbGgP7lJD0LUOLQSHLy1Lv8WY/0hFltVfqoTiIdRuT+yB68lw==|920 \ No newline at end of file diff --git a/Pages/任务/工时/修改报工.rd b/Pages/任务/工时/修改报工.rd index 8a38fc56..85da7e83 100644 --- a/Pages/任务/工时/修改报工.rd +++ b/Pages/任务/工时/修改报工.rd @@ -1,11 +1,11 @@ { "PageType": 0, "ColumnCount": 18, - "RowCount": 20, + "RowCount": 24, "CustomNames": [ { "Name": "报工ID", - "Formula": "修改报工!$B$19" + "Formula": "修改报工!$B$23" } ] } \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json index 7a792b81..5eab35bd 100644 --- a/Pages/任务/工时/新增报工.json +++ b/Pages/任务/工时/新增报工.json @@ -43,23 +43,14 @@ }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 10.0, + "IsHidden": true } }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 177.0 - } - }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 12.0, - "Mode": 1 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 35.0, + "IsHidden": true } }, "18": { @@ -69,12 +60,13 @@ }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 177.0 } }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 12.0, + "Mode": 1 } }, "21": { @@ -83,12 +75,32 @@ } }, "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "26": { "GridRowColumnDefinition": { "DesignLengthInPixel": 27.0, "IsHidden": true } }, - "23": { + "27": { "GridRowColumnDefinition": { "DesignLengthInPixel": 27.0, "IsHidden": true @@ -96,10 +108,14 @@ } }, "InLogicalVisibleIndexes": [ - 22, - 23 + 12, + 13, + 14, + 15, + 26, + 27 ], - "Count": 24 + "Count": 28 }, "Cols": { "RowColumnAttachedInfos": { @@ -233,9 +249,10 @@ "3,11": "计划", "5,1": "执行时间", "9,1": "实际工时数", - "13,1": "工作进展", - "20,1": "取消", - "20,20": "提交" + "13,1": "特定时薪", + "17,1": "工作进展", + "24,1": "取消", + "24,20": "提交" }, "Formulas": { "7,1": "TODAY()&\",\"&TODAY()" @@ -244,6 +261,7 @@ "3,1": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -377,13 +395,113 @@ "controlsPosition": true }, "DataValidationInfo": { - "NumberType": 2, - "FirstParamValue": "0.1", - "SecondParamValue": "9999", - "IgnoreBlank": false + "NumberType": 9, + "ValidateCommand": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B8" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "开始日期" + }, + "EndValue": { + "SerializeProperty": "结束日期" + } + } + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "时间差天数", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=DATEDIF(新增报工!开始日期,新增报工!结束日期,\"d\")" + }, + "ID": "55fd97778e7248d28af7a84b8dd02418" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=新增报工!当前值" + } + ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!时间差天数*24" + }, + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"最大报工时长不能超过\"&新增报工!时间差天数*24&\"小时\"" + } + } + ], + "ID": "bfbb5d36-b10d-4ef4-b8c3-9a24ab50fc13" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0" + } + ], + "ID": "700b4da3-d136-4399-ac02-2cbc6d4c020d" + } + ] + } + ] } }, "15,1": { + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "Enabled": true, + "AllowRoles": [ + "项目总监" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "min": "0.1", + "max": "99999", + "step": 1, + "precision": 1, + "placeholder": "请输入", + "controlsPosition": true + }, + "DataValidationInfo": { + "NumberType": 2, + "CompareParamType": 4, + "FirstParamValue": "0" + } + }, + "19,1": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], @@ -412,7 +530,7 @@ "resize": "none" } }, - "20,1": { + "24,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -424,7 +542,7 @@ "TemplateKey": "_RS_Information3" } }, - "20,20": { + "24,20": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -465,7 +583,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "919f526a2a1f45069c0f7f1d65b3d5d7" + "ID": "9a7bc64402df47908183e25054b07dc5" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -605,7 +723,7 @@ "ParamName": "进展内容", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B16" + "SerializeProperty": "=新增报工!B20" } }, { @@ -664,7 +782,7 @@ "ReloadData": true } ], - "ID": "68f02e54-b6cd-4d0a-8f78-7b6427c4e1d7" + "ID": "50ce072d-d795-4d3d-b9f5-64df76e8ddaa" }, { "CommandList": [ @@ -679,12 +797,12 @@ "BtnText": "知道了" } ], - "ID": "e2add62a-d49b-439a-a985-cc4893a7ad44" + "ID": "a81db5d0-60bb-4633-92bb-8f1bd0b07633" } ] } ], - "ID": "ec972c3c-db39-4b76-bd72-1a428a580eb2" + "ID": "ff64f21a-146d-41b6-a6e1-8c2f511364fa" }, { "CommandList": [ @@ -694,7 +812,7 @@ "Message": "用户已取消" } ], - "ID": "88f2d0a5-24e0-4f4c-b275-b600165e789d" + "ID": "044fc9ca-fa53-4ec3-b054-be7d029236a8" } ] } @@ -737,12 +855,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "01c0a797-8482-462c-a16d-aa0b8be107a4" + "ID": "71f696e7-0bc5-4124-a103-39262a735f82" } ] } ], - "ID": "d5e4e0c9-47f9-49ec-b23b-46903c57799b" + "ID": "1f197300-5d7a-486d-b116-8e14be610b4f" }, { "CommandList": [ @@ -817,7 +935,7 @@ "ParamName": "进展内容", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B16" + "SerializeProperty": "=新增报工!B20" } }, { @@ -830,7 +948,11 @@ }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "指定时薪单价" + "ParamName": "指定时薪单价", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B16" + } } ], "ResultErrorCodeTo": { @@ -876,7 +998,7 @@ "ReloadData": true } ], - "ID": "9b3a6302-0d35-4748-9aaf-94b4b27364d5" + "ID": "c3937a39-5188-4c1c-97d5-8b8c66b9c0fe" }, { "CommandList": [ @@ -891,12 +1013,12 @@ "BtnText": "知道了" } ], - "ID": "53f0f680-4199-4043-b761-0d9a2efd47fa" + "ID": "e07c223f-3a2f-45a5-b0b6-c1af9dc996bd" } ] } ], - "ID": "4a746207-7a31-4c5e-83ff-8b97257135bd" + "ID": "b520bb2c-61ff-4b37-8bd6-2ac7fb179fb7" } ] } @@ -905,7 +1027,7 @@ "TemplateKey": "_RS_Main1" } }, - "22,1": { + "26,1": { "BindingInfo": { "TableName": "任务表", "ColumnName": "ID", @@ -1095,7 +1217,7 @@ "12,22": 2, "12,23": 2, "13,0": 2, - "13,1": 3, + "13,1": 1, "13,2": 2, "13,3": 2, "13,4": 2, @@ -1144,8 +1266,54 @@ "14,23": 2, "15,0": 2, "15,1": 2, + "15,2": 2, + "15,3": 2, + "15,4": 2, + "15,5": 2, + "15,6": 2, + "15,7": 2, + "15,8": 2, + "15,9": 2, + "15,10": 2, + "15,11": 2, + "15,12": 2, + "15,13": 2, + "15,14": 2, + "15,15": 2, + "15,16": 2, + "15,17": 2, + "15,18": 2, + "15,19": 2, + "15,20": 2, + "15,21": 2, + "15,22": 2, "15,23": 2, - "17,1": 2, + "16,0": 2, + "16,1": 2, + "16,2": 2, + "16,3": 2, + "16,4": 2, + "16,5": 2, + "16,6": 2, + "16,7": 2, + "16,8": 2, + "16,9": 2, + "16,10": 2, + "16,11": 2, + "16,12": 2, + "16,13": 2, + "16,14": 2, + "16,15": 2, + "16,16": 2, + "16,17": 2, + "16,18": 2, + "16,19": 2, + "16,20": 2, + "16,21": 2, + "16,22": 2, + "16,23": 2, + "17,0": 2, + "17,1": 3, "17,2": 2, "17,3": 2, "17,4": 2, @@ -1167,38 +1335,88 @@ "17,20": 2, "17,21": 2, "17,22": 2, - "18,1": 4, - "18,2": 4, - "18,3": 4, - "18,4": 4, - "18,5": 4, - "18,6": 4, - "18,7": 4, - "18,8": 4, - "18,9": 4, - "18,10": 4, - "18,11": 4, - "18,12": 4, - "18,13": 4, - "18,14": 4, - "18,15": 4, - "18,16": 4, - "18,17": 4, - "18,18": 4, - "18,19": 4, - "18,20": 4, - "18,21": 4, - "18,22": 4, - "20,1": 5, - "20,2": 2, - "20,3": 2, - "22,1": 6, - "22,2": 7, - "22,3": 7, - "22,4": 7, - "22,5": 8, - "22,6": 2, - "22,7": 2 + "17,23": 2, + "18,0": 2, + "18,1": 2, + "18,2": 2, + "18,3": 2, + "18,4": 2, + "18,5": 2, + "18,6": 2, + "18,7": 2, + "18,8": 2, + "18,9": 2, + "18,10": 2, + "18,11": 2, + "18,12": 2, + "18,13": 2, + "18,14": 2, + "18,15": 2, + "18,16": 2, + "18,17": 2, + "18,18": 2, + "18,19": 2, + "18,20": 2, + "18,21": 2, + "18,22": 2, + "18,23": 2, + "19,0": 2, + "19,1": 2, + "19,23": 2, + "21,1": 2, + "21,2": 2, + "21,3": 2, + "21,4": 2, + "21,5": 2, + "21,6": 2, + "21,7": 2, + "21,8": 2, + "21,9": 2, + "21,10": 2, + "21,11": 2, + "21,12": 2, + "21,13": 2, + "21,14": 2, + "21,15": 2, + "21,16": 2, + "21,17": 2, + "21,18": 2, + "21,19": 2, + "21,20": 2, + "21,21": 2, + "21,22": 2, + "22,1": 4, + "22,2": 4, + "22,3": 4, + "22,4": 4, + "22,5": 4, + "22,6": 4, + "22,7": 4, + "22,8": 4, + "22,9": 4, + "22,10": 4, + "22,11": 4, + "22,12": 4, + "22,13": 4, + "22,14": 4, + "22,15": 4, + "22,16": 4, + "22,17": 4, + "22,18": 4, + "22,19": 4, + "22,20": 4, + "22,21": 4, + "22,22": 4, + "24,1": 5, + "24,2": 2, + "24,3": 2, + "26,1": 6, + "26,2": 7, + "26,3": 7, + "26,4": 7, + "26,5": 8, + "26,6": 2, + "26,7": 2 }, "SheetStyle": { "FontFamily": 1, @@ -1207,16 +1425,70 @@ }, "Spans": [ "11,1,1,22", - "15,1,2,22", - "20,20,1,3", - "20,1,1,3", + "19,1,2,22", + "24,20,1,3", + "24,1,1,3", "7,1,1,22", "3,11,1,12", "3,1,1,8", - "22,1,1,5" + "26,1,1,5", + "15,1,1,22" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon", + "currentUserProperty": { + "UserProperty": "角色", + "PropertyType": 3 + } + }, + "value": "项目总监", + "compareType": 10 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!13:16" + }, + "Value": true + } + ] + } + ], + "ID": "0a89a84c-63ff-429e-84c7-eb7da6dacea7" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!13:16" + }, + "Value": false + } + ] + } + ], + "ID": "f1848b7a-43af-43d1-9ce9-e89c72fb99d2" + } + ] + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -1242,11 +1514,11 @@ "CustomNames": [ { "Name": "任务ID", - "Formula": "新增报工!$B$23" + "Formula": "新增报工!$B$27" }, { "Name": "工时类型", "Formula": "新增报工!$L$4" } ] -}///7asOd5dapnuBEjGKSW0wRBUDvpYEXUr4hjlV0j6Qd4U5Pxi7KcP1ObEqkTq97eK73H7pxt7nA3867sawCK8kQxRJvzqwVuzodBvwJysTZ9hacCDn4UDvE4539GIa69MiFPRDmEVIVcTdpi8lAarPN+VBPyH0wkOnVYWW/yQNNgLpneOTKsFFSk2a6/7IsvchYSNxveJfVoz2w4KXg67lBEkmGi37IIyNEBJ+eTNJSVDkrNfRkk79L/+vP18qWr6klToD6/FPxCA9SJGpiPYjvuDVjFkYBqNn/V9cdup9QWHZ6oLSXFQZ/qAozvfwj6cpElbL5ui6p75qr/lVBweYGT10AQPmXuNxPtX46nKM3FWSrUvd71Av+Z9qEZCF4gVZKHMxPo4WadYJXdazQ+TjrZKId/NBdZeKdlXVB4kRjhmGXSKZI8yibIsZ8MtnwlGs9YqOSZkWkeHm/GtXp9AF05b4CmzgBuzKwxFNXlTqtVkcIDjyRL6/ZYb5ul6ZhJ03naXRofaFWC4tOX0nedDGs/Jyf9rua4sb/5fKoVstmBITh6ogokAnuX82gs+S3sKBMM5E88NnJ3flkmhf8Z7Cwb2QXeV37VMqHBuLn12HC3N3QHyGv5xtYDMYEAT5P2B+8teyUEjFFotm6UaNYrZ/wc2hvgdioJLcQ3+LBF5/S8zNgcwRgktJIBqeuFMyM4LWznq4ek+7ERWF827vzPVSJHbLpa9oRRWMUKcaH1oWxzjvF9KI9kybIanWA0jKbWOtmarM6XuqoC9MqN6jUE5LKujRQQWhNmZ56zGuUrZ7jlvvkQWkcoFsY8MXbuQprUm2CLD/JtnbcwaA8/Z+MYuP9oETKC7cKoTQ+bDSoFk04dnfOmyv5daUZqGg5oWLXO73SpS5+TJ5bjL5DgzzVEMKA==|920 \ No newline at end of file +}//x3iLiXdTN3I4+gyzx6nqFfcetj2vh0Uq5LjKJQ4/3FkbugW6s1PMwDtDaXudUOFRkwWM/I5QNJ/l1midRI21RgGkYv+J38+kEFn5uskXJXKsz9yRJ5o6WUtkcm1wMyTep8lBvYoMl/eP3dFHLInPlbH5IGTpncYKWBLhKLeKkos7vkEQ4QGk3dCKIZTcjR6M+LN5zWRNsLGcyMXKBPusw/YNrYwPJAbz+pj+dppaH9O+kVVujM8KGFGOt7x+S5i/BByszs+CEZQkwUyiNXxeNyQRTaq/Bkh0+SNmavaK/deZwWmz2u0uhQ/K4uwmkDR2TzK3cDXtcZ+5n72c7mSjqt+CkD3xdbIGH6iC619Z0R3l6ohHPTYDGCLDZSoO8z58v2G9WRHZcFc2fMWfagxGukw79AVtJEPKFoWLDZNgfZ4zQuIfVCI0cvIYiQVDyjIYepCDWrxiokI+2LmXpXm2AsC0VNAxgejFnDWo164zbk1NaRD6xyQM50vPfFhTumIBFnQeS0F/PETJKwV6vwwGDNM1qeUdMzYUPDSYu+gqJyEXmL63Y3CGUu1i5sYP5cWMYhoi9HXfdgrJMuGyW6RCsGO8KT+rF4GGwZ8KldCEpyG7u5PQBaaq4rxtDieIJuqvVxMlps9GnH7lg/Ei7eeC8Oervx9dlHLUxwN5VTwIKqavaegZpq1/0A15F8OmZFuZ1nD5SKuu+Z4YeStNIhzB7mK8s5g985kR7wge457PmwHrGuUtu1O+DQWFVqlaAWzxN9XAmXTT2V7Rz2V5b/I6M402vrlf+ZJFCzdKg9ONor19L8Qy8e/Bn93ERQFt2DnYRxvhtM5MF5bBLKp4oOxr2QM1go6F2imbVjOwt1CbTTBJwaBzmfuekqnVUivi/y4xk7HD0lMVSHaHcoFbYo4gIg==|920 \ No newline at end of file diff --git a/Pages/任务/工时/新增报工.rd b/Pages/任务/工时/新增报工.rd index 6820836f..6df86694 100644 --- a/Pages/任务/工时/新增报工.rd +++ b/Pages/任务/工时/新增报工.rd @@ -1,14 +1,14 @@ { "PageType": 0, "ColumnCount": 24, - "RowCount": 24, + "RowCount": 28, "Formulas": { "7,1": "TODAY()&\",\"&TODAY()" }, "CustomNames": [ { "Name": "任务ID", - "Formula": "新增报工!$B$23" + "Formula": "新增报工!$B$27" }, { "Name": "工时类型", diff --git a/Pages/流程页面文件夹/FGC_任务详情.json b/Pages/流程页面文件夹/FGC_任务详情.json index 9b632ca5..dfeb3dc0 100644 --- a/Pages/流程页面文件夹/FGC_任务详情.json +++ b/Pages/流程页面文件夹/FGC_任务详情.json @@ -89,17 +89,20 @@ }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 20.0, + "IsHidden": true } }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 20.0, + "IsHidden": true } }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 20.0, + "IsHidden": true } } }, @@ -294,6 +297,9 @@ } ], "PostCommands": [ + { + "$type": "Forguncy.Model.IgnorePageDirtyCommand, ServerDesignerCommon" + }, { "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", "FunctionName": "remove", @@ -304,42 +310,8 @@ "Title": "加载中" }, { - "$type": "Forguncy.Model.IgnorePageDirtyCommand, ServerDesignerCommon" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=FGC_任务详情!Action.Name" - } - ] - }, - "value": "标记为已读" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", - "PageName": "FGC_我的待阅" - } - ], - "ID": "26eb7b95-2cbe-4461-94a3-2d66205c80fa" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", - "PageName": "FGC_我的待办" - } - ], - "ID": "a352dbff-3cf2-4eb1-8418-1321946ad253" - } - ] + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true } ], "TemplateKey": "流程样式2", @@ -603,4 +575,4 @@ "Formula": "FGC_任务详情!$B$4" } ] -}//rDsgwSfn57W2zMwEBNoQWxuuZlZzsYr49ghV0hkRuuRgBv90eE4Zge25AHAFwgcSpQAcc6O2mnl3IwjefaBEk+c3jPx1CeqYk7d0BOjcKw8TSEV5ff+Q3ps9KKayJCDlpa2HFncjxyRbh1TJ/44uS8lZMk6G9W2HZ7l93XyGhK2NTNUNpIiBCFyqaPypYWEab7TXKDMkTBZteroFHIotoxq8mcUJQbTqY86teS2KckBWNEmTyZDm4azYop4T7O7XUMvifhGTOzuuZpMLZqxWvxUdbsfSR5AIFFKT6N0zRgNW3qfyccwIgho9XgraMwnismXhuG8BcrIw2VsQlWRLdmbeqe8/WG/pCfMOluTUTQABuwoypbxudMO2cGa+TzST5ecqhlGtKQ6TT3JyNUKsdjAe5o0EsnwH0/H8Qu4Hp3QvGfO842fjqbMGTohhEIqlPezsAJfRvzrpp8jbHsKDdOQQXO2QqOmVYVyiz2hXwJJUtgwsf7seq0YXsEisZaR4DPFygXti62zpzyuJsEHXca+3CVOBuYo3xQHpppU7RHLT1Hjmv+0xISdz4lEvPzSsB8iH+EXhZtmEoetIzOuTlDrbAl4V15fIosDwID/ZgiyUwzFpwy5VXw2FAyRGkeHNe+ibg7mAAbd7qB5z+Pkue2EGqCRowYAVCgFctZPtM9T0xDMTVvJ0mk6mUgpL4Pl9X99vByZUTOA2vw2AVC9dhKcrWRKW77SmDrALVKRGWmz7jOBHmi99N4xjl934Bew1lkf1ix6GbAVnYp+iv7HJjde6a5b9E305Noa/yCRovmhXD/zsXHWy/B3Kh6u62zVsTwTBANVKjO9RMfJ64DLmi4zqLiEIEmLQE8iKR/ujXwkVnwwyG30BRHzwsn5TXX+jLOW2NxVAgNjNjY7Xlef2wg==|920 \ No newline at end of file +}//9wNZrBn6kfQ247MBOvw3OtPGvUhYHcOhYvoUh8/To1TxOkbqqQ0ddiMmtAQj+LPfpfoJub9TTz3cgzHLgbLRg2pUNohrpd39UBpnorqKCuKcXsmvqLIhXKlQyDcSmWnOIUtjvU6kd1ef8Kr3MXeVNUOJ2rk8WHT3hspZUYQY8/KErZHBYgaJUZFrjSuZ45Fdgf9/1yeIVKCVN/vJW87FL1dTg/DsGj3t0+wfsUMuny1obwAtWFcqXRFwcnJnVSp0cjbOqjLxWhzhMFvvyrhGZQ7Z3OtZnx7vgAS2dCeiM71F5TqBS/EcjZGyUTnqNpMCJFTd1EYjfgyDDa9L767xDBtAB2yKlbupqlStYI0/kGLkai38FxGNvwATklUVMYtPcU3SkF9nCvfA2WChxyc8B1c2mj1ZuB3NTbzQC3d6guIN1RIXNFFsr4HFKuDBc6K5/nplA36gurEEpy9emiGinnmuWTaiUpKSEbxLsOpsWjqVFuknOH5eT43gS/R/nko/ddoJffPQq/Jre1BACgABVHpjLrbRHo0baKYDv8hLUskXjEjA8FHM7WW9dbFmPss3H/ZnyzaNwzeRNA9S8fpeLM1aeY3B4oPHZvroGLmwOTU2uYfk5/F7tsw4vYDtSbVB52fIbal07efWpVhEHhnZELFQDlUzrQ3/gfjJ1LoWUIDoJ6sH29/gVB9iDfg/pZezwkUUCSLSK8ncQ7xFlUuX7hl5EnEGqu+Z7Jp19QwtUsz3qTQU1BrclStv5H3SJ/0CAI8ibYuic9FmyJz3waJFCipVBuyeHOZXeMsZZQOaC7NOQhhjMRU0M32IHe8WNRe03gHTHCs7Jb5TDsH1aebsaTnIXTjDaPeciS6XtBYus4zjxtzuESUzi1xvyHY7ERI77l+EzkAoQJvRfYH95PVyRw==|920 \ No newline at end of file diff --git a/Pages/项目/项目成员详情.json b/Pages/项目/项目成员详情.json index e85e8984..5d338308 100644 --- a/Pages/项目/项目成员详情.json +++ b/Pages/项目/项目成员详情.json @@ -165,6 +165,7 @@ "4,1": "成员默认时薪", "7,1": "岗位", "10,1": "默认时薪", + "10,14": "*优先级低于任务成员时薪", "14,1": "取消", "14,12": "保存" }, @@ -296,129 +297,149 @@ "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!B9" - }, - "Title": "获取中" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "岗位", - "TableValue": { - "TableName": "项目岗位", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "项目岗位", - "ColumnName": "默认时薪", - "GUID": "fc96af9b-45a5-4390-a5e6-d6457ff37273" - }, - "ColumnName": "默认时薪" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目岗位", - "ColumnName": "ID", - "GUID": "de9d950e-3a64-451e-91ae-f82c4a256835" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!B9" - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "f1e8788e6b7f43ada37ce5974657e4b9" - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!B9" - }, - "Title": "获取中" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=岗位" - } - ] - }, - "value": "%Null%", - "compareType": 1 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=项目成员详情!岗位.默认时薪" - } - ] - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!B12" - }, - "compareType": 1 + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" } - ] + }, + "value": "userInput" }, "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B9" + }, + "Title": "获取中" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "岗位", + "TableValue": { + "TableName": "项目岗位", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目岗位", + "ColumnName": "默认时薪", + "GUID": "fc96af9b-45a5-4390-a5e6-d6457ff37273" + }, + "ColumnName": "默认时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目岗位", + "ColumnName": "ID", + "GUID": "de9d950e-3a64-451e-91ae-f82c4a256835" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B9" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "cbe333b934a3409d8e43a34d9d1594c6" + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B9" + }, + "Title": "获取中" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ { - "ConfirmDialogSettings": { - "Title": "确认", - "FormulaText": "当前岗位时薪于设置不一致，是否为你更新？", - "YesButtonText": "是", - "NoButtonText": "否", - "ConfirmIcon": 1 + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=岗位" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目成员详情!岗位.默认时薪" + } + ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B12" + }, + "compareType": 1 + } + ] }, "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!B12" + "ConfirmDialogSettings": { + "Title": "确认", + "FormulaText": "当前岗位时薪于设置不一致，是否为你更新？", + "YesButtonText": "是", + "NoButtonText": "否", + "ConfirmIcon": 1 }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员详情!岗位.默认时薪" - } + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B12" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!岗位.默认时薪" + } + } + ] + } + ], + "ID": "fee5006f-e486-4dcc-b01b-11e719a9cc38" } ] } ], - "ID": "d24a2f7b-c625-461a-a07a-857f2bcdb804" + "ID": "6ff0ecce-e280-4216-9313-3983accdfed5" } ] } ], - "ID": "3b9893e2-a358-429a-99d0-049ce1b9c524" + "ID": "b252d74c-0ce4-4053-bdb6-92f1e4b4a365" } ] } @@ -597,7 +618,7 @@ "ShowConfirm": false } ], - "ID": "3ef5972e-4224-4329-83e7-89a8db26b303" + "ID": "ebdd591d-7308-41ce-949f-7cf38e32ff56" }, { "CommandList": [ @@ -607,7 +628,7 @@ "ShowConfirm": false } ], - "ID": "92afc930-79bb-47ae-b6aa-e8cde6732512" + "ID": "bf245a5b-6c95-4f0d-80ef-9279066d8ca3" } ] }, @@ -629,7 +650,7 @@ ] } ], - "ID": "333bec23-450e-4a17-b4f0-e03c73a2cda6" + "ID": "53d241fe-c885-4ca0-9ee4-b1632f47f72b" }, { "CommandList": [ @@ -639,7 +660,7 @@ "Message": "请指定项目" } ], - "ID": "ba01a341-f200-48b9-87b6-76cf22478b0d" + "ID": "7dec9613-cfaf-48da-ba38-8be9f89694ff" } ] } @@ -679,11 +700,17 @@ "FontSize": 13.333333333333332, "Formatter": 2 }, + { + "FontFamily": 0, + "FontSize": 12.0, + "Foreground": 3, + "HorizontalAlignment": 4 + }, { "BorderBottom": 0 }, { - "Background": 4, + "Background": 6, "BorderBottom": 1, "BorderTop": 1, "BorderLeft": 1 @@ -703,16 +730,18 @@ "Body", "[AUTO]General", "¥#,##0_);[Red](¥#,##0)", + "Text 1 50", + "Right", "Background 2 0", "#FFFFFF00", "black" ], "Borders": [ { - "Color": 3 + "Color": 5 }, { - "Color": 5 + "Color": 7 } ] }, @@ -796,35 +825,35 @@ "10,11": 1, "10,12": 1, "10,13": 1, - "10,14": 1, + "10,14": 3, "10,15": 1, "11,0": 1, "11,1": 1, "11,15": 1, - "12,1": 3, - "12,2": 3, - "12,3": 3, - "12,4": 3, - "12,5": 3, - "12,6": 3, - "12,7": 3, - "12,8": 3, - "12,9": 3, - "12,10": 3, - "12,11": 3, - "12,12": 3, - "12,13": 3, - "12,14": 3, + "12,1": 4, + "12,2": 4, + "12,3": 4, + "12,4": 4, + "12,5": 4, + "12,6": 4, + "12,7": 4, + "12,8": 4, + "12,9": 4, + "12,10": 4, + "12,11": 4, + "12,12": 4, + "12,13": 4, + "12,14": 4, "14,1": 0, "14,2": 1, "14,3": 1, "14,12": 0, "14,13": 1, "14,14": 1, - "16,0": 4, - "16,1": 5, - "16,2": 5, - "16,3": 6, + "16,0": 5, + "16,1": 6, + "16,2": 6, + "16,3": 7, "16,4": 1 }, "SheetStyle": { @@ -876,4 +905,4 @@ "Formula": "项目成员详情!$E$17" } ] -}//zjp1dKiZsTgWzcBy7k57awgY+9kFNxH9u+IgQidUdzMYfTtdqrHWCV3f0iSJOkVgBwYz0zLlbtIaooMIjwxuTfWlKcGhZctUW52+f/7tf1YOSkwfE96Isr6kstFx4OxZjUhhtyjtQivhbqYNgRZQWe47QlKB0iZi//0zuYcP5qi80wKR53H1Hcx0yO971Tte07/bh8CptxgH4/tAZM1wZiWXkF5Guktcyh8n41vwsTrgwcd+gzp10sWl1xMHDQkVwMLBe4gRMXEWG9IUUeCOSIaMnX4KyVP+AjbXysX11b7W7sHPMnnjxgKAbI2NNTEfDnLZ/sKqvsPpJJyWBh1Kygjy+xfPpbKlPUhHalJvLBIEopuTSoDlRr8dJA4V5N8gYXLzqGDzqS5a77GdFl/aiOF7IAeTB/H+tO3sG9udfA00zpPuF07ZcP6zN3XFfvkkJt1RcVwwbBgdI185G/3hEgy6+ekitCVDnFepnnEEJ0YeyDnAs/3/kT2j0xKwo+93PaE2vlgrf4KvgxBm4M/FFbhXjrgJf+dvc/WvLxJGTtdJKJUIe0rB+hXqVgzSErLINSruSDxRLFrMNZLMAHan6ZZl71Xd22VAuqqWGLqVXC9IgyxL9ZMHRnCvKBDl+lerFIqC0hsYxnwfR+MyN8ZBM75CO9qHKo2XaYdMXvEPZxCecZFqTGW6nawfvXgn0EVUIl1Y+saAgmqtajiYnSSF9iuwP3cfzjEpBaKGdyoZkIl0czH2vu4hSZcfKuOy3JOSpgbmD1JOFScgh7cV+Z5dFcmss6dUzCVYTowdSeIf7HBDa5zUy2ZdHly7hmcGrVDq6FNuqTUsH03pYAJEU+sQ6vhhdCZzYoMO2zW5N7S5WKJo75LW0/NXXJoPbOGLa2ecYMxSYsLaS2qImwcoRTNY5w==|920 \ No newline at end of file +}//UBwp6ard7TJ6AkNBtjc1nsR4jjk5DDdhaUZcFRjuao818Blds0fKBmZpTOTdnYRoUo8XARxKmdriTutMyx3X7A1t7oYALfbqL3qNVBJDVwY8sUZLayceHfr1u+6pNXol23gJ4pwz5GxFr+STmynQy+gq+8OBC/usr/slzfL4sLegr4a6p5f58M23OXvxNpi8SwC1ffFGHdlEAqgxky3+sOm/NA6kbIgFwrd3T5kp5vLh7IIxPupbuXsw/4gS0WCjFj4mbXFaQskqS/MTLPe8yIil/AtCV15fLaxKFSN4ZCwarNi1TtNMj2tOofsV95WZbLVFUNYK3jqjLlIk6s1JiKKNfaWlLKpdIDkuBF39yZxdwYPSp3X4YWYjrSWZ7QH9/DX55OkraGjDichgEGNjYN0gVXbV9rp2klPImf5kqwBSc4ZaszcZXflGZ9ByoDuOUmIHerBKbu+OFq4PAF92fFZm91kDXEI/V1UHW43xa/5tbrPWeN53PE36tgObBWluRTeVs5qTNaZpWYxsC76jm9xq/NcbYRZ0OMyynHkgn0h+PQ6SGnrj33G+TGitcDtc8S6UQJ3c+dTBmMbXXQedYMyAREtUd3ug5APC8uKfl/MDvPf0kcKwZiccP8t3vguI7Dogj/Tup2wdCOKmLN+V8mFJxFDCjcdnt9tnr/D0P12nybWPE9Tui+gm1/vaHICZHOjbkJreVSoxBxHjDoiOSEA5sN4FlQwApz4DiLktcXtILLjFKiLQLLEgRAFkLpaaWa5raHAoSPZfmVn6tx6cldtfz0VwsALwcF84+2C3Kjz+FbUlomlwlH7+M+HbxY5YjfJ9piOXbEKjZ0OclxcfIVNuYGyfUenwesUKD5vnu87MFGs5xP7AaxATmLHf00JKmx9TwOLNED3QeFcQrGx/sQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json index 11c57671..f6563ca9 100644 --- a/Pages/项目/项目首页/项目配置/项目信息.json +++ b/Pages/项目/项目首页/项目配置/项目信息.json @@ -273,7 +273,7 @@ "1,6": "项目名称", "4,6": "项目简介", "8,1": "项目日期", - "8,15": "项目周期", + "8,15": "计划周期", "11,1": "所属客户", "11,15": "所属客户部门", "14,1": "管理员", @@ -294,6 +294,10 @@ "29,1": "网络资源", "33,18": "提交" }, + "Formulas": { + "9,1": "TEXT(E36,\"yyyy-mm-dd\")&\",\"&TEXT(I36,\"yyyy-mm-dd\")", + "9,15": "DATEDIF(E36,I36,\"d\")" + }, "AttachInfos": { "2,1": { "BindingInfo": { @@ -380,11 +384,6 @@ } }, "9,1": { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "计划开始日期", - "GUID": "a10a60e4-dcff-43fa-a4c7-0ce7653792b8" - }, "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", "CommandList": [ @@ -411,11 +410,21 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!P10" + "SerializeProperty": "=项目信息!E36" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=DATEDIF(项目信息!开始日期,项目信息!结束日期,\"d\")" + "SerializeProperty": "=项目信息!开始日期" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!I36" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!结束日期" } } ] @@ -454,8 +463,8 @@ "9,15": { "BindingInfo": { "TableName": "项目表", - "ColumnName": "计划工期", - "GUID": "601753c1-fbb6-4e3f-9d27-740c09cd6672" + "ColumnName": "计算计划工期", + "GUID": "5d29694c-9361-4b70-a632-30ed5ad7de2d" }, "CellType": { "$type": "ElementUI.InputNumberCellType, ElementUI", @@ -898,7 +907,7 @@ } ], "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面", - "ID": "350f0ab4-392c-4404-94b5-2866e5e2a3eb" + "ID": "a2cc5b44-fa60-4dec-97d8-c7058a76f182" } ] } @@ -952,7 +961,7 @@ } ], "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面", - "ID": "29369a71-9ba3-404f-a296-6fb9e785ba97" + "ID": "3a622efa-e554-4e48-b0a4-3fd0e8de7bda" } ] } @@ -1187,6 +1196,181 @@ "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!B10" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "开始日期" + }, + "EndValue": { + "SerializeProperty": "结束日期" + } + } + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "新增或修改项目", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!项目ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "封面", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!B3" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目名称", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!G3" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目简介", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!G6" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目方案", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!B25" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "预算方案", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!B28" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "所属客户", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!B13" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "所属客户部门", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!P13" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "管理员", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!B16" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "工时核定方式", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!B22" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "权限", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!I16" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "分组", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!P16" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "预算工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!B19" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "预算金额", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!I19" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "严格模式", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!P19" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "开始日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!E36" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "结束日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!I36" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "网络资源", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!B31" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -1194,235 +1378,44 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "5b79a673-3839-41ee-80c3-78b5017b5037" - } + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目信息!code" + } + ] }, - "value": "%Null%" + "value": "0" }, "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B10" - }, - "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedRange", - "RetrunParamNames": { - "StartValue": { - "SerializeProperty": "开始日期" - }, - "EndValue": { - "SerializeProperty": "结束日期" - } - } - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "新增项目", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "封面", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B3" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "项目名称", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!G3" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "项目简介", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!G6" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "项目方案", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B25" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "预算方案", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B28" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "所属客户", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B13" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "所属客户部门", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!P13" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "管理员", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B16" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "工时核定方式", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B22" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "权限", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!I16" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "分组", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!P16" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "预算工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!B19" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "预算金额", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!I19" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "严格模式", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!P19" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "开始日期" - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "结束日期" - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=项目信息!code" - } - ] - }, - "value": "0" - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!msg" - } - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true - } - ], - "ID": "a7af1694-6f0c-4d59-8435-2836d7463638" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息!msg" - }, - "BtnText": "知道了" - } - ], - "ID": "597f9e25-fb50-4dd3-9019-74db6a8fd632" - } - ] - } - ], - "ID": "5b915fd3-1dbc-479f-a336-3f31368e8c43" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目表", - "ShowConfirm": false - }, { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "保存成功" + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!msg" + } }, { "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", "ReloadData": true } ], - "ID": "c3b76761-dc4b-4427-bc09-0baa4b33dfac" + "ID": "58474495-b912-4147-8ee8-59b62dd11467" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "2b181331-69eb-4560-b5c7-3b3ce5bee962" } ] } @@ -1437,6 +1430,20 @@ "ColumnName": "ID", "GUID": "66ba562c-2d2c-49db-8383-b5118215cd00" } + }, + "35,4": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "计划开始日期", + "GUID": "de12a945-d880-4883-b6cd-af3289b14708" + } + }, + "35,8": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "计划完成日期", + "GUID": "1b9d7a89-ba82-40a3-a6c6-ef1d88fa6fb6" + } } }, "StyleDatas": { @@ -1960,13 +1967,15 @@ "27,1,1,20", "12,15,1,6", "12,1,1,13", - "9,1,1,13", - "9,15,1,6", "2,6,1,15", "5,6,2,15", "2,1,4,4", "35,1,1,3", - "30,1,1,20" + "30,1,1,20", + "35,4,1,4", + "35,8,1,4", + "9,15,1,6", + "9,1,1,13" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1986,6 +1995,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], + "RelatedDataTableName": "项目表", "ConditionFormatRulesCollection": { "Rules": [ { @@ -2032,4 +2042,4 @@ "Formula": "项目信息!$B$36" } ] -}//LiNbT/tW1cFv+8CPlW5vz3LfdwC0LE8GDQ54/tlsVMrF8vKrxBZbXs/LajJENaAL+9w4YqKzp4Qer+ieXtx2kRXejiMgoF3AsXzqUABONGbE8aIueTBzlkdjTBBqZ5YHyl3UkNX58Gob4L6JOGnvyxOF6I0rOFJSxOejtpQLiI+dQwNuyBUEYUVBGxQGAbmxg/3DMrxVF6NNVwIOxlpnuT16hn1mu1RlnjdCGary2yNm+KPpzAzY6YXt6nlMIwA5CSy99Z9NdpgppuKOiz5In7oHFNByQ5kcoVSi64F6Vft7/67opBNVhAxcVi+oVr/Z3ZWxOv9hGws9oM+KjUZ0LrfLVyyH0LPWW91IbiHzNz9jVbCPh2cRRmK5PyJ3dA1sz9qsNm74JGn58bdlxlkLJQRpYJVZtrmTFkQa1wwsBaR2F0/Q9xDsfhK1scaOwtpgFU+WClfpjim/zm/tav1gUpA4hSZ5OKMuNFecleSSSZB5pyrkSQQK82FAWzhJlZHaQCfCwSu0SuTUyjqrr5HzRtWakGaGxx3YboYC7ud61lkXft6n5L7o2FmJyEPyA4DgbsN2nbosq6+GxH1U6CZxSR3B7KJ0KnjMi7x7urOLuOiOyhsQCo4u7jxwK6vJKBtzrsgNQJOJRb2hSaNZRq5c+JvFim23bYLt5tMYSfQsdGyivtORGLnL61EXpGI2Ap6DPmp4c2EnmKgNDwsYdrN5ycR2jH8B3MbDRw+OCo07aPXanwcXb5Zv46UKHwx8xCbGkpxecgjFR5dcyc5DBIYsveti3555QqHLvpPUit5jwshRqkjaq+KY9Z6TF5EEy/aDtn7V+Z9ZDL2kvjdbZTx0uHoXstE7caVxMsf6DIfLAJGq3jT90CFoVKCgHUQN5IZe01FxBGxiVE+VIFQaSGQYLA==|920 \ No newline at end of file +}//Q7oUsxEUKFv4hYfHTeWGCS9ETpa1MWQs2y4/pquXGCBK89Z8mAPEHJIRq0XtIoq3JLB5TwTTk4gQFTciglo1F8UpDjKodkmUtOaCqCKI89nkNTJN1i5Kz3xyjGQ/LM9z9tK8k9fYf5Sl7aZAxP99WmsBKMUxxCdQLe5xWSkhm/bDMJdI4i6g8WXAi5YXo6r41uitTFCHDKnbuIFJ0vCdRYo9H50PB36iwSfps86WdjFDUQ79Z6hIebylA0oGqv78uhY7Zo5XnvOm/3Dk+r3rxDKKNoUNNqdbviLyNIjPMYEQMcqQOwm/z1Hpef+E6+Mgr4MiQdRav3LvYgSb7I9eU6xbI8NepGQNQgcrBuWLvry7M3r9iDqiXzZpvwJpTi+rdc9Kq20PGlrAFjNZ4pWlIMBjIXNRWQg4W8G7PWgFvqiIZ0g/au8+OSAWn2R2oN3u3MByFe9FsTFrLHLv9siGhGYJ4xFOQX+hQG/VRKCTJ6LySXGxC7RWxRiScH8G5wx/CIBnkz6AEtAU4E5QnNHhDCgaKrj5oQiqZg1ch+OQ7/WcvIyfetvtvpNyle/azu3CZ89k8ZGPB3JlqaJKfxyOsKK1eTg0K3ICe411VerZQXzO+Ag8IEHPld/cImBj5IWLAJdxE0dFX4F/lpX39o6Dm4Jj/3NyxxxTWJC15gJysbflXBwxafK6X503f/VzYmQTwaskctvfGt3HCvBnVTa3CLZkmFxVF9HjnCZxPbg0zgp0xtkrS10YAMmbDoC+tHTnmiZUy1htpE8wnfZwl58GqwwDTbe/Mkjz1nAyOUzkUw4GEas42LNHdgoE13XyIMMOW0od/3+SHV7fRBacTKulscG8mFtJRFwBegqp1Sk2NsIhDberTp8pNpRBl2NMmM8q7KXk6hQoFy70R5TWSrpN8A==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目信息.rd b/Pages/项目/项目首页/项目配置/项目信息.rd index 0ee036c5..e5ad38a7 100644 --- a/Pages/项目/项目首页/项目配置/项目信息.rd +++ b/Pages/项目/项目首页/项目配置/项目信息.rd @@ -2,6 +2,10 @@ "PageType": 0, "ColumnCount": 22, "RowCount": 36, + "Formulas": { + "9,1": "TEXT(E36,\"yyyy-mm-dd\")&\",\"&TEXT(I36,\"yyyy-mm-dd\")", + "9,15": "DATEDIF(E36,I36,\"d\")" + }, "CustomNames": [ { "Name": "项目ID", diff --git a/Pages/项目/项目首页/项目配置/项目审批.json b/Pages/项目/项目首页/项目配置/项目审批.json index 01b03cea..40842964 100644 --- a/Pages/项目/项目首页/项目配置/项目审批.json +++ b/Pages/项目/项目首页/项目配置/项目审批.json @@ -452,8 +452,8 @@ "11,27": { "BindingInfo": { "TableName": "项目表", - "ColumnName": "计划工期", - "GUID": "329144a1-49cd-4ae0-9f9f-209a5fff5eed" + "ColumnName": "计算计划工期", + "GUID": "2438286e-28f4-4193-b9d8-3d63759888bf" } }, "13,5": { @@ -917,11 +917,11 @@ "11,23,1,4", "11,5,1,6", "11,16,1,6", - "11,27,1,6", "13,1,1,4", "16,1,1,4", "16,5,2,28", - "13,5,2,28" + "13,5,2,28", + "11,27,1,6" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -946,4 +946,4 @@ "PaperSize": {}, "Margin": {} } -}//XyqPpeqI6EMS02KBJfc9e6eveNwXd6Hddw17tNAkZAH4a731rDh1KU7dp+S5ljcGOseoOEiu2i/rghSNnqXy2tV6ExiJBdeXSazSLFSwnBjQmOo1WrQFaagNFpYQOPNHVHNxBHeUuTMQ4bAljjCGFKYhzsHiCkdCSTdz4KrmV65sDk4qnZI26Z07qVjCd7tGAcjENc/2UixEkrHGg2MWcgKPStk+tClYpyqcnKJ1kNifk9saEEliqELHRJydDgrdDtKkE2BZBCBIIdNacP5SZi3AC68tuT+QgEkcR7jQDuCqluuJjl6/9G6SOJX+NEIVTkS4lk+UyEDrVN52edSa8PZyhcFXR/Z4BV+DuGiIcUpZuMOdXTHbBQ3p7IgScwFDQ3pHG7cJZXBBfYbMY4OL4d9HWABnQlbvnSbwXdh5Ar1itdnVUpAskkFALROv/w3PuQNL5BSOEzHX1E9LTjW4jjIYBNO/HNOhpDTH8dM+6Opha+KDvdcLsycQZEXrinO/lcoqIPTeKgxRxImbmkyhnsQhAevu1OgcFlxm7z7BN8iDPAt2BoPbnaWkka+mKQz86ZVODiJ4qEGu6Xc749VRMxvGrKTeHqbVdeK13baRDwZ76yycLotEd4WA/aBKf48fAM4OmtEYGTDdGJ02mxHquixfKO/HpJIPguSatdmTw4mCDhDFfWtqmD8EOWqV/veVZGaQZ3qLB5iFoHgXKppZJbxzFNKY3iP1+r60eNdrLdsHQmOLa9lpjCN/gUGRZr5ZdBpeX1PJHhirZ9CzuiccqZnAMeggrLHEH7LiFhG1wnbj86fSF4KT+xcjbq2UOr91UQf9PdJlvv1L+ucGvk8imlAzHv+r8fFykq7xyU2dbGpY8qrcuRfptD9ZdJSq9Ra67dIHfTJbBgPyTIvXY17BXQ==|920 \ No newline at end of file +}//3YNgrbzaYeljqxLWhRaNozN2Or+ZisZvyVypQOgzaV0Ivq8vUBNjkZHhgNIlTHBKYqdkD0EF5zOh2LuqOaSLqegkc1vJ2rp9B3P1K5TLs7wFVexO9jt/vee1i7W4dxW+/iLqtZ7dryUaMUzMJLO1WYfOftUZ4NRdtYkaintoNMz/IGZlo+DbmgxgnfOrW4/NK20YXR+Y+iP/E8Mu34WNxrRFfX5PMEQ3nJw6apBKqHMQS7eUMnwwNhMDhzOMfggtSlEQq5LuTpKmk2CMlqRdHLGPEFhofSt+GBdEttx/qxuisMN3gAolg66PMCaELaAcaoCpewugajC9U4Il919tOsT/iijZ5y5jksHRmxbad5z6mBtcWxnsULPybZfFAYkP8z+IlkdLH5dBMEY3kCPM6UxKlQJ6d8rp+kTYEXgkJGsKssYkgVg5rfX0v+X1/INTQzZrCqJQv+HISIyL9D7UFtnlKMlhyyswj8z9U+BDkJWglWH+2Df+mo0Ag6O8vyr30LtdV4Ofu5TGMVtKpAWBOlGQB5EWy4v7pxe1C3MbZK8MPGC+JslcO56xidBioIDWeP30XBOVdYVhIJd0Y7UJ9yC5paXMS8y2iox+291ylfBUyKaG9AWkNCArqfjEyVnyWCejmwN0enI0PTzzvAtbbQY3i8XpbuCcqWz7aXbRiIeUGw5UEjBqFeAgCc6eOnaQN142TgTiUyYXeBaZrLmDq4Y1Q9whTkCRsSvaYyjJJ08frSybSNGDA9gkuHrktGDnaiP+C1RL6GSTBjjJKqFXTz0GNfy25WZ5J5bDQCetoWhHGAVgOJ8bRDjgHZxPcUacYk2w8i2V71YXJgS3+XJSD0TG/KzLZ2etSu6WV3Brj/bRqYUuf9hnXrqWiQ6kqi1OLk2hFvQIsb/0RnsBgfAbHg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json index 71b36012..62f2db7d 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json @@ -42,7 +42,7 @@ }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 230.0 + "DesignLengthInPixel": 252.0 } }, "8": { @@ -335,6 +335,64 @@ "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "项目甘特图" } + }, + "7,1": { + "CellType": { + "$type": "EchartsCustomCellType.EchartsCustomCellTypeCellType, EchartsCustomCellType", + "EChartTitle": "Echarts图表", + "DataSourceBinding": "DataSources", + "DataSources": [ + { + "Name": "xm", + "BindingTableOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "工时日期", + "GUID": "0f39fdfa-8807-4169-8abb-d26ecba6c71b" + }, + "ColumnName": "日期" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总计划工时", + "GUID": "e22e8774-de36-4f7d-951c-d2ba5706fd95" + }, + "ColumnName": "总计划工时" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总实际工时", + "GUID": "780adbe4-fb3b-432b-b671-552efc92f9c7" + }, + "ColumnName": "总实际工时" + } + ], + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "工时日期", + "GUID": "36fbcecc-b720-41e1-a98f-c3085b20e89f" + }, + "Order": 0 + } + ] + }, + "CustomColumns": [] + } + } + ], + "JSONDataSources": [], + "ImageDataSource": [], + "Config": "{\"option\":\"const {\\n \\\"日期\\\": xAxisData,\\n \\\"总计划工时\\\": yAxisData\\n} = ForguncyEchartsHelper.splitDataSource(Context.xm);\\n\\n// 改变页面图表样式\\nlet bgColor = \\\"#fff\\\";\\nlet color = [\\\"#0090FF\\\", \\\"#ffc300\\\", \\\"#f64662\\\", \\\"#ec610a\\\", \\\"#00c9b1\\\", \\\"#6730ec\\\"];\\n\\nfunction hexToRgba(hex, opacity) {\\n return (\\n \\\"rgba(\\\" +\\n parseInt(\\\"0x\\\" + hex.slice(1, 3)) +\\n \\\",\\\" +\\n parseInt(\\\"0x\\\" + hex.slice(3, 5)) +\\n \\\",\\\" +\\n parseInt(\\\"0x\\\" + hex.slice(5, 7)) +\\n \\\",\\\" +\\n opacity +\\n \\\")\\\"\\n );\\n}\\n\\noption = {\\n xAxis: {\\n type: 'time',\\n data: xAxisData.map(el =>{ return el.split('T')[0]})\\n },\\n yAxis: {\\n type: 'value'\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n symbol: \\\"emptyCircle\\\",\\n symbolSize: 8,\\n showSymbol: false,\\n lineStyle: {\\n normal: {\\n color: color[0],\\n shadowBlur: 5,\\n shadowColor: hexToRgba(color[0], 0.1),\\n shadowOffsetY: 6\\n }\\n },\\n areaStyle: {\\n normal: {\\n color: new echarts.graphic.LinearGradient(\\n 0,\\n 0,\\n 0,\\n 1,\\n [\\n {\\n offset: 0,\\n color: hexToRgba(color[0], 0.3)\\n },\\n {\\n offset: 1,\\n color: hexToRgba(color[0], 0.1)\\n }\\n ],\\n false\\n ),\\n shadowColor: hexToRgba(color[0], 0.1),\\n shadowBlur: 10\\n }\\n }\\n }\\n ]\\n};\",\"graphTheme\":null,\"displayMode\":\"canvas\",\"jsCode\":\"\\n async ({Context,JSONContext,ImageContext,echarts,myChart,dat,Forguncy,d3,setInterval,setTimeout,ForguncyEchartsHelper,PublicResource})=>{\\n var datGUI=undefined;\\n var option={};\\n const { \\\"日期\\\": xAxisData, \\\"总计划工时\\\": yAxisData } = ForguncyEchartsHelper.splitDataSource(Context.xm);\\n// 改变页面图表样式\\nlet bgColor = \\\"#fff\\\";\\nlet color = [\\\"#0090FF\\\", \\\"#ffc300\\\", \\\"#f64662\\\", \\\"#ec610a\\\", \\\"#00c9b1\\\", \\\"#6730ec\\\"];\\nfunction hexToRgba(hex, opacity) {\\n return (\\\"rgba(\\\" +\\n parseInt(\\\"0x\\\" + hex.slice(1, 3)) +\\n \\\",\\\" +\\n parseInt(\\\"0x\\\" + hex.slice(3, 5)) +\\n \\\",\\\" +\\n parseInt(\\\"0x\\\" + hex.slice(5, 7)) +\\n \\\",\\\" +\\n opacity +\\n \\\")\\\");\\n}\\noption = {\\n xAxis: {\\n type: 'time',\\n data: xAxisData.map(el => { return el.split('T')[0]; })\\n },\\n yAxis: {\\n type: 'value'\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n symbol: \\\"emptyCircle\\\",\\n symbolSize: 8,\\n showSymbol: false,\\n lineStyle: {\\n normal: {\\n color: color[0],\\n shadowBlur: 5,\\n shadowColor: hexToRgba(color[0], 0.1),\\n shadowOffsetY: 6\\n }\\n },\\n areaStyle: {\\n normal: {\\n color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [\\n {\\n offset: 0,\\n color: hexToRgba(color[0], 0.3)\\n },\\n {\\n offset: 1,\\n color: hexToRgba(color[0], 0.1)\\n }\\n ], false),\\n shadowColor: hexToRgba(color[0], 0.1),\\n shadowBlur: 10\\n }\\n }\\n }\\n ]\\n};\\n\\n return {\\n option,\\n datGUI,\\n };\\n }\\n \"}" + } } }, "StyleDatas": { @@ -358,6 +416,9 @@ }, { "FontFamily": 1 + }, + { + "FontSize": 13.333333333333332 } ], "Types": { @@ -412,35 +473,6 @@ "5,32": 1, "6,32": 1, "7,1": 4, - "7,2": 4, - "7,3": 4, - "7,4": 4, - "7,5": 4, - "7,6": 4, - "7,7": 4, - "7,8": 4, - "7,9": 4, - "7,10": 4, - "7,11": 4, - "7,12": 4, - "7,13": 4, - "7,14": 4, - "7,15": 4, - "7,16": 4, - "7,17": 4, - "7,18": 4, - "7,19": 4, - "7,20": 4, - "7,21": 4, - "7,22": 4, - "7,23": 4, - "7,24": 4, - "7,25": 4, - "7,26": 4, - "7,27": 4, - "7,28": 4, - "7,29": 4, - "7,30": 4, "7,32": 1, "8,1": 4, "8,2": 4, @@ -472,7 +504,17 @@ "8,28": 4, "8,29": 4, "8,30": 4, - "8,32": 1 + "8,32": 5, + "8,33": 5, + "8,34": 5, + "8,35": 5, + "8,36": 5, + "8,37": 5, + "8,38": 5, + "8,39": 5, + "8,40": 5, + "8,41": 5, + "8,42": 5 }, "SheetStyle": { "FontFamily": 1 @@ -480,10 +522,10 @@ }, "Spans": [ "3,1,1,30", - "7,1,1,30", "1,1,1,30", - "1,32,8,11", - "5,1,1,30" + "1,32,7,11", + "5,1,1,30", + "7,1,1,30" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -534,257 +576,10 @@ "PaperSize": {}, "Margin": {} }, - "Charts": [ - { - "ChartType": 29, - "DataOrientation": 1, - "Tag": { - "$type": "Forguncy.Model.ChartDataMapping, ServerDesignerCommon", - "DataSeriesMapping": [ - { - "ListViewColumnFormula": "计划工时" - }, - { - "ListViewColumnFormula": "实际工时" - } - ], - "ItemsMapping": { - "ListViewColumnFormula": "日期" - }, - "IsDataSourceEnabled": true, - "DataSource": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "View_任务工时统计", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "工时日期", - "GUID": "10a3d3b5-2d7b-4975-b0ae-33903c173bd8" - }, - "ColumnName": "日期" - }, - { - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总计划工时", - "GUID": "6cca1b7a-20fe-400e-a5d3-5c0a4d36d1b8" - }, - "ColumnName": "计划工时" - }, - { - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总实际工时", - "GUID": "4f633881-9c35-4eec-b215-8ebc2f049faa" - }, - "ColumnName": "实际工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "dc07ea74-592d-4c0a-87a9-73ce7d1dd762" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目概况!项目ID" - } - }, - "OrderBySqlCondition": { - "OrderByColumns": [ - { - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "工时日期", - "GUID": "269430ba-2938-48d8-8a44-e031da2bf2cd" - }, - "Order": 0 - } - ] - }, - "IsListviewDataSource": true, - "CustomColumns": [] - }, - "DataSourceListviewName": "79ea2292-e6a7-4656-9306-bc909173ccab" - }, - "DisplayEmptyCellsAs": 1, - "DisplayHidden": true, - "ChartColorPalette": { - "RepeatAlgorithmTint": [ - 0.0, - -40.0, - 20.0, - -20.0, - 40.0, - -50.0, - 30.0, - -30.0, - 50.0 - ], - "ColorList": [ - "Accent 1", - "Accent 2", - "Accent 3", - "Accent 4", - "Accent 5", - "Accent 6" - ] - }, - "XAxises": [ - { - "Items": [ - "2024-03-01T00:00:00", - "2024-03-02T00:00:00", - "2024-03-03T00:00:00", - "2024-03-04T00:00:00", - "2024-03-05T00:00:00", - "2024-03-06T00:00:00", - "2024-03-07T00:00:00", - "2024-03-08T00:00:00", - "2024-03-09T00:00:00", - "2024-03-10T00:00:00" - ], - "UseCustomItems": true, - "MajorTickPosition": 0, - "LabelFormatter": "m/d", - "ShowMajorGridlines": false, - "MajorGridlinesStroke": "Background 1 -15", - "MajorGridlinesStrokeThickness": 0.8, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "StyleInfo": { - "Fill": "transparent", - "FontFamily": "Body", - "FontStretch": "Normal", - "FontStyle": "Normal", - "FontWeight": "Normal", - "StrokeDashType": 8, - "Stroke": "Background 1 -15", - "StrokeThickness": 0.8 - } - } - ], - "YAxises": [ - { - "Visible": false, - "Orientation": 1, - "Items": [ - 0.0, - "NaN" - ], - "DisplayUnit": 1.0, - "MajorTickPosition": 0, - "LabelFormatter": "General", - "ShowMajorGridlines": false, - "MajorGridlinesStroke": "Background 1 -15", - "MajorGridlinesStrokeThickness": 0.8, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "StyleInfo": { - "Fill": "transparent", - "FontFamily": "Body", - "FontStretch": "Normal", - "FontStyle": "Normal", - "FontWeight": "Normal", - "StrokeDashType": 0, - "Stroke": "Background 1 -15", - "StrokeThickness": 0.0 - } - }, - { - "Visible": false, - "Orientation": 1, - "AxisPosition": 1, - "LabelFormatter": "General", - "ShowMajorGridlines": false - } - ], - "Legend": { - "Orientation": 0, - "Alignment": 1, - "IsAutomaticFill": false, - "StyleInfo": { - "Fill": "Transparent" - } - }, - "DataSeries": [ - { - "ChartType": 29, - "Values": [ - 29.0, - 29.0, - 29.0, - 29.0, - 29.0, - 18.0, - 18.0, - 18.0, - 18.0, - 18.0 - ], - "Name": "计划工时", - "MarkerSize": "7,7", - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "StyleInfo": { - "Fill": "Accent 1 0 51", - "Stroke": "Accent 1", - "StrokeThickness": 0.0 - } - }, - { - "ChartType": 29, - "Values": [ - 15.6, - 15.6, - 15.399999999999999, - 7.2, - 7.2, - 1.2, - 1.2, - 1.2, - 1.2, - 1.2 - ], - "Name": "实际工时", - "MarkerSize": "7,7", - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "StyleInfo": { - "Fill": "Accent 4 0 51", - "Stroke": "Accent 4 0", - "StrokeThickness": 0.0 - } - } - ], - "PlotArea": { - "IsAutomaticFill": false, - "StyleInfo": { - "Fill": "transparent" - } - }, - "StyleInfo": { - "Fill": "Background 1", - "FontSize": 13.333333333333332, - "Foreground": "Text 1 35", - "StrokeDashType": 8, - "Stroke": "Background 1 -15", - "StrokeThickness": 0.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Name": "Chart1", - "Location": "32,680", - "Size": "960,230" - } - ], "CustomNames": [ { "Name": "工时走势", - "Formula": "项目概况!$B$8" + "Formula": "#REF!" }, { "Name": "关键数据", @@ -799,4 +594,4 @@ "Formula": "项目概况!$AG$2" } ] -}//MF04xyaPCj0TV0GFm5hdq+QePRcJbTstf5K6K47zTNTP7sBZ7pT7jnGlsG8rfv3wJk/lXRaGKVtn/X/Usn5XF9WVuCS4y5TvxVNEm8Aoc7optgsGv8IkYwdd1ngjr69p7tax9fMzMN3aFXevVjZkMQ2fOsEjdL+8uuVqQrm+tphokvU1SvH5PYNAaOEdnnih7Gomy5pknu+r8UmOL4RpJPj6YOrnJ7SNPf44+Tv+HWKnAvM9sz5vCiQ+wLUC6iOVapewu+ChBaSqhBXu3/Hf8Mr0Lcesp+f62LvnkdPxDCNJTOiCof/N6NbsyRIRfu9wGyprJODo7JSQlBZSMDnL0qggb5UHOu/MM2RRiAtWGP0pX0LA6M6ZSYrXup7hIddsRLhnnwVUEl4BiPXC0ImSZuu5BJ6jxOx2VwZSsluq7TQk8mWdAmvfG0Ylge18kvOOvIc0/4QceooNDvw2kl9WUn11i78a8Dqy2Os+vsxQgPuDDKsalHHkmDgU/P+RCnHZPBpPBQBQ1zwdBYsUnH0z/tyQ1p/ZYHLX85CM0O56m18Etcov9k6p+fnqrUn1HJUxq8qc+dYGCuu2y9OB6880dGT9vHDYGoFT/2bSlakhzvxO+hTz0swNTNok7tx5h2Ra3hS4d56vGFcxE7rR13Q88XBiv0MtCkQndPTbk5qKZVFo0dI0+9ZqGyQpXD+QzOKHZgZVj0wd0HUsBZ33AZ6wMgT6XREirZhGRY/AxSqf0xeuqAT4HYI27HTkF2LBfKLuJAE1JuV7v5UTYZxSXAtc+6yNKFdBiKmVBZOn0Gvf1EzNws/TuSpBWD5lSGxL8lmdPu1uT8jlhAToe6UrrOmRwzF4LMo18ARqAtCc1u61JfA0o0XAqKW0UrwMMU2pyBOMS69qMF2osLF5peL0KbebtQ==|920 \ No newline at end of file +}//gN2wu5r6s+UEJ+E75cRIurr6BaUFpMCE2CDYKdMH1h6gmFTZq9Ivi7Cgx3yV9X+/7pyCPaPJHUiOeQ8TOJ5bek+X+nsv8RM6lBqtDf/2mXzYCxi3Vic+JXnCPWbP8BX6SW0JZahHjVwNmOdreL3XNbVnI0MZ7q9oYR73HFFeUCtEODqWxPGHur7b1+2I5lEgigdMjOmfoomAfHD+CFvVF1BH1YvpnDTqGB7pC6Y+k8bWjlKxcltw1SeUAjdnEI77NbX/ooqynQL+0EGF4MFr4PlYEQxIzx+Yjkc9iNcsF1rYVeKXktH2hplLlZ78uL9gsTS77G/2wOax0ts2w2UuhExyxOJmyxK9kH3+je5Og91bUosgn2SiJmQacfvTxloWxv72O6NWHzBEEvNjurHpdW3/pB94SZiPU4XzGZtr82a5pA/Y3V25k02GRc7syRYlP/G85BOXwQMK60W+RKU2Rtw8SLBc82tGdY+obvxoGN1JDwXUmyjFP//9VbXF0XBRjDazmLq1XiBnYgW8khQJPrBUU2Y4nkPQNHuIVz6KAYzV99wO/xKHxqQR2y6yg8pAw8rpofyDlzSFBpiy2kjrr5c0J2DNw58Zf7dh+/RAK9aIbOaZrdU2mgAHH+8fKqeHzSA7HbxuABfUcZtjMRLiSFUJEmMcOniCr2NmoUaDCXozku1cbwSLKcFFZnGQFnMHWqvZTiJap84Jii3rGWOO28y/p0dJ7DxsK8yEjCN671B9A37LlsExoZylljNFLxLGH4Hv/7Kwl1XmyLwOM72mhXkRcntUWKLYSvhSCW4uh96atS+mHC67I+X7QjKGgsrh0p1N1rMD/cZZE/kDFKcohOib2vk2t1I7F0tYzqDMb/HI07EwPQmkfVPQobIJQH23kFyoYQuAdhfmg3/rggAETg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd index 0526b78c..d2b7b236 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd @@ -5,7 +5,7 @@ "CustomNames": [ { "Name": "工时走势", - "Formula": "项目概况!$B$8" + "Formula": "#REF!" }, { "Name": "关键数据", diff --git a/Plugin/Echarts图表-10_0_0_0.zip b/Plugin/Echarts图表-10_0_0_0.zip new file mode 100644 index 00000000..ff0e69a7 Binary files /dev/null and b/Plugin/Echarts图表-10_0_0_0.zip differ diff --git a/Plugin/Notiflix-9_0_103_0(1).zip b/Plugin/Notiflix-9_0_103_0(1).zip new file mode 100644 index 00000000..4c4f2a8d Binary files /dev/null and b/Plugin/Notiflix-9_0_103_0(1).zip differ diff --git a/Plugin/Notiflix-9_0_103_0.zip b/Plugin/Notiflix-9_0_103_0.zip deleted file mode 100644 index 74131a9e..00000000 Binary files a/Plugin/Notiflix-9_0_103_0.zip and /dev/null differ diff --git a/Process/立项流程.bpmn b/Process/立项流程.bpmn index 4d83e7a7..5da1dc63 100644 --- a/Process/立项流程.bpmn +++ b/Process/立项流程.bpmn @@ -4,7 +4,7 @@ 用于项目的立项申请审批 - + diff --git a/ServerCommands/工时/新增工时.json b/ServerCommands/工时/新增工时.json index 48460919..eb8723ce 100644 --- a/ServerCommands/工时/新增工时.json +++ b/ServerCommands/工时/新增工时.json @@ -117,7 +117,7 @@ "ColumnName": "任务时薪", "GUID": "93b2f1d8-fd53-468a-9211-87f51b6a5494" }, - "ColumnName": "任务默认时薪" + "ColumnName": "任务成员时薪" }, { "BindingInfo": { @@ -130,7 +130,7 @@ "DisplayColumn": "默认时薪" } }, - "ColumnName": "岗位默认时薪" + "ColumnName": "任务岗位时薪" }, { "BindingInfo": { @@ -178,7 +178,70 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "28feaa57524d4b629c887584e8943b68" + "ID": "565209b7bd154c90b096249545dfa352" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目成员", + "TableValue": { + "TableName": "项目成员表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "e72fecb8-c4b6-4ef0-a802-f18cb6d6ba24", + "RelationBinding": { + "RelatedTable": "项目岗位", + "RelatedColumn": "ID", + "DisplayColumn": "默认时薪" + } + }, + "ColumnName": "项目岗位时薪" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "90991267-4d34-4537-8be3-0ef990118f3e" + }, + "ColumnName": "项目成员时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "25c7933c-8b27-4163-ad03-a22d7efe88fb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "02b01205-9bbb-4e4f-8534-f52ea963c907" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "99e42cdcf1d74dc2aa15b8fadb9d87e5" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -288,19 +351,6 @@ }, "ColumnName": "项目预算费用" }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "17b7e0ce-f6c5-4095-93e6-637aa62440a7", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "工时核定方式" - } - }, - "ColumnName": "工时核定方式" - }, { "BindingInfo": { "TableName": "任务表", @@ -346,7 +396,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "fd009643b2374e2fbc54775cf4ebe137" + "ID": "a9121deede5e47809d0a7e3a37a1befc" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -365,16 +415,194 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "计算时薪", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(任务成员.任务默认时薪>0,任务成员.任务默认时薪,IF(任务成员.岗位默认时薪>0,任务成员.岗位默认时薪,IF(任务成员.参与人默认时薪>0,任务成员.参与人默认时薪,0)))" - }, - "ID": "03fde63189d94667ae6d5c6a1979a5bb" + "$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": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算时薪", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员.任务默认时薪" + }, + "ID": "068f4611d05f4d0f8c97425c44bea1f0" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "时薪计算来源", + "ParameterValue": "任务成员时薪", + "ID": "59b966a6d5e042b79fba6d9e1f659758" + } + ], + "ID": "e82fc3fd-1f12-4671-a8db-c281d9a508d6" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员.任务岗位时薪" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算时薪", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员.岗位默认时薪" + }, + "ID": "c661840bf7dd4209b486efc6b9eebf59" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "时薪计算来源", + "ParameterValue": "任务岗位时薪", + "ID": "05df8d3ef9fa454b8ec03882ddda515f" + } + ], + "ID": "beacabcf-3bb9-4323-bbf4-a7fae4f5ba83" + }, + { + "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": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员.项目成员时薪" + } + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算时薪", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员.项目成员时薪" + }, + "ID": "3c9b1a387c9942f68be78e905f6efe7f" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "时薪计算来源", + "ParameterValue": "项目成员时薪", + "ID": "25ff3a82fd57430b94e16b296b77c513" + } + ], + "ID": "21f7227a-17fb-4cbb-a041-e28ee5e26b34" + }, + { + "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": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员.项目岗位时薪" + } + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算时薪", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员.项目岗位时薪" + }, + "ID": "7851dbe270c34767aeeb95f619c1f52b" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "时薪计算来源", + "ParameterValue": "项目岗位时薪", + "ID": "22bb1104b90b4467b078e638f3f4aa51" + } + ], + "ID": "cfaf4dbf-85a9-4bd8-afbc-b133edf12a79" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算时薪", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务成员.参与人默认时薪" + }, + "ID": "ca126f12d798410491c2eae2674f0ec6" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "时薪计算来源", + "ParameterValue": "用户默认时薪", + "ID": "fd64e93a07ae4ca2820422202ad6e7a4" + } + ], + "ID": "323a99c1-f431-4171-adf2-bd1011494ea2" + } + ] } ], - "ID": "1be0fa3d-4226-478b-9916-63423673dea2" + "ID": "4a4bd5f5-6079-4b28-b3e2-95aaa77a2972" }, { "CommandList": [ @@ -385,10 +613,16 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=指定时薪单价" }, - "ID": "6fc649ddfae843caa1f555278ace195d" + "ID": "f2849da5adc443fb92b3dbb9bb1779fb" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "时薪计算来源", + "ParameterValue": "特殊指定", + "ID": "a8b2f1ff8b9c4519b5e80575c9550bed" } ], - "ID": "ae194b64-06f0-4113-8c61-89b159094f8a" + "ID": "d998a80f-60c4-4412-ae82-9a3353b0fe0e" } ] }, @@ -433,6 +667,71 @@ "value": "1" }, "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目统计信息", + "TableValue": { + "TableName": "View_项目统计信息", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "工时核定方式", + "GUID": "b31caaa2-8cbc-4f56-8e9e-0597c91d89da" + }, + "ColumnName": "工时核定方式" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算费用", + "GUID": "1f23c586-e318-41f8-9e2c-f9fc47949199" + }, + "ColumnName": "项目预算费用" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算工时", + "GUID": "45110ee2-aa57-4a49-bea6-a94586f164ba" + }, + "ColumnName": "项目预算工时" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总核定工时", + "GUID": "a4773f83-2817-4be0-9e7d-4b5b3cd36ed5" + }, + "ColumnName": "总核定工时" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总成本", + "GUID": "7c3a493f-d2ac-49b3-957f-7a772d5138bf" + }, + "ColumnName": "总成本" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "0aa2d908-82fb-4233-a1e8-eb5a36cecaa2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.项目ID" + } + }, + "TopCount": "1" + }, + "ID": "8f20e26c0c7f468f93fd1112fda69cb7", + "Comments": "从视图统计项目的信息" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -443,7 +742,7 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时类型" + "SerializeProperty": "=项目统计信息.工时核定方式" } }, "value": { @@ -452,63 +751,6 @@ } }, "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目统计信息", - "TableValue": { - "TableName": "View_项目统计信息", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目预算费用", - "GUID": "1f23c586-e318-41f8-9e2c-f9fc47949199" - }, - "ColumnName": "项目预算费用" - }, - { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总成本", - "GUID": "7c3a493f-d2ac-49b3-957f-7a772d5138bf" - }, - "ColumnName": "总成本" - }, - { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目预算工时", - "GUID": "45110ee2-aa57-4a49-bea6-a94586f164ba" - }, - "ColumnName": "项目预算工时" - }, - { - "BindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "总核定工时", - "GUID": "a4773f83-2817-4be0-9e7d-4b5b3cd36ed5" - }, - "ColumnName": "总核定工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_项目统计信息", - "ColumnName": "项目ID", - "GUID": "0aa2d908-82fb-4233-a1e8-eb5a36cecaa2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务信息.项目ID" - } - }, - "TopCount": "1" - }, - "ID": "9a972b19262c4b819a666d6c442c6d6b", - "Comments": "从视图统计项目的信息" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -534,12 +776,12 @@ "ErrorCode": "400", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"计划工时总时长(\"&工时数&\"h)超过项目预算工时时长(\"&项目统计信息.项目预算工时&\"h)，请修改后提交！\"" + "SerializeProperty": "=\"项目工时预算不足，请申请预算后提交！\"" } } ], "Comments": "如果加上本次提交的工时>预算的工时，则拦截", - "ID": "18583b21-d2a0-428e-996a-3cfc62fd4887" + "ID": "518a9271-6e46-4a9a-9b18-41f4bf2a7a31" }, { "Condition": { @@ -561,11 +803,14 @@ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "预算超过项目限制，请申请预算后再尝试提交！" + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"项目费用预算不足，请申请预算后提交！\"" + } } ], "Comments": "先算出本次提交产生的成本，如果>预算的费用，则拦截", - "ID": "d4cd3b02-8a6f-41dc-bf86-9773da9f0fb4" + "ID": "4109f03a-956f-422b-be68-13d8edf1f4c7" }, { "Condition": { @@ -610,7 +855,7 @@ } } }, - "ID": "9d97ee1dd7d0410b9602c3373d41759c" + "ID": "f7ed048b6276441b8981d5758a1bf56a" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -639,25 +884,25 @@ } ], "Comments": "如果任务当前工时+本次报工工时大于预算，则拦截", - "ID": "c3edd061-47b0-48f1-924e-f0b3a7250f6a" + "ID": "18e16fe3-8d87-4306-900f-cf0b7ab17100" } ] } ], "Comments": "如果上面两条项目都没超标，就检查是否设置了任务预算工时。", - "ID": "b3bfc6b0-689a-45a4-99ca-7b07d8b03653" + "ID": "7b3a035b-cbd4-4beb-ba34-3b0da0a8b25c" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式", - "ID": "5c34c921-a5f1-434e-a589-050799038608" + "ID": "3e24d042-00d3-46e1-b07f-9134849cc28c" } ] } ], "Comments": "严格模式下，需要校验工时和费用是否超标", - "ID": "dae3bbb7-7b4e-48d3-8b08-fecf28a357c1" + "ID": "6884a15a-1da6-4a79-9d98-42f406e6b48b" } ] }, @@ -762,7 +1007,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "fbb132d33b854e1aaf0d772bc3a8dbef" + "ID": "5bbe6bbbe41642e19df09b58c7b289c3" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -794,7 +1039,7 @@ "ID": "44b51db4c6be470dbc468d4a9abfa061" } ], - "ID": "6bdf772f-22a4-4f5b-b055-9f6536541fd0" + "ID": "3e265f58-f9c4-4380-a74c-a0a3ac089b8b" }, { "CommandList": [ @@ -808,7 +1053,7 @@ "ID": "de7c26c08e4e4086bfa6f4d8dbcaa4fe" } ], - "ID": "69e6f7b6-a80f-4d1e-907c-e6a189bd95f7" + "ID": "69598862-13bb-447e-afaa-39457f3d44e3" } ] }, @@ -838,7 +1083,7 @@ "ID": "03f94c6a676740b799eddd0aafce2fe5" } ], - "ID": "cd001833-22d4-4525-bcf3-0692f8a4164f" + "ID": "549f42fc-cbe4-422c-a493-02d7ce693210" }, { "Condition": { @@ -860,7 +1105,7 @@ "ID": "f998993f4e8f4778a448ca19dc771a2b" } ], - "ID": "2c656595-72a8-4019-b45a-26b2f75d103c" + "ID": "baab28eb-8a70-4c8c-97c9-769d468934be" } ] }, @@ -915,7 +1160,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "48030a9d-d571-48e1-ba20-5a07fde2d76d" + "GUID": "344588f5-2837-40af-ac17-16ba8d1d493a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -926,7 +1171,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "f560a7a1-56da-43f4-81ed-4fcbd46e74b0" + "GUID": "b3e83a46-79ec-4561-ba4f-7943d9ee7e71" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -937,7 +1182,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "f75337d0-3045-47db-b89f-91e723bb678b" + "GUID": "5b5d6e91-43a2-44bf-85b9-ba2d2954465a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -948,7 +1193,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "5eaa88d9-791e-429d-b63a-a33127b143d6" + "GUID": "e0186f85-f462-44d1-84dc-b78871d946b0" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -959,7 +1204,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "c0a03cd6-8949-45ab-b55a-112f8350a866" + "GUID": "0eafacff-e048-48f3-b48f-0ca82a89d73d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -970,7 +1215,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "7a34035c-a6c0-4c86-9ee2-ffce0a7ecd21" + "GUID": "6ca1d705-d57c-44f2-914b-eff4774fa49a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -981,7 +1226,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "26d2cda5-0221-4f00-bbf3-af07b8a1fa39" + "GUID": "6dcb7e08-7e02-4c85-9264-453d97833ba6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -992,7 +1237,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "59ceb364-5bae-44c0-8ad5-c6a86452cb45" + "GUID": "f7409fd9-e56a-4767-bc33-06b0010d71cd" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1003,12 +1248,23 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "提成系数", - "GUID": "f8051ee9-3d0a-4ca2-930b-118a5f359c71" + "GUID": "78395ee2-2002-4354-9309-d5aeab731ad0" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务信息.提成系数" } + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "时薪来源", + "GUID": "99f983c0-c3bc-48c0-a98e-9754e62d5268" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=时薪计算来源" + } } ] }, @@ -1053,7 +1309,7 @@ ] } ], - "ID": "dfad8684-4662-48c9-a44b-d8c82d1ce252" + "ID": "c13c63bd-75ed-4fd4-9e63-9c5b780a49e4" }, { "CommandList": [ @@ -1066,7 +1322,7 @@ } } ], - "ID": "f238fec4-27aa-4f24-b2b6-3096a1e12d58" + "ID": "421b11ec-1f58-4993-bfae-5fa734979761" } ] } @@ -1080,7 +1336,7 @@ "Message": "提交工时成功" } ], - "ID": "70d852be-8d93-43a3-a7b5-edcab6981caf" + "ID": "93db7169-bcca-429d-aacf-3fa2b546ee52" }, { "CommandList": [ @@ -1093,12 +1349,12 @@ } } ], - "ID": "01558a83-dd2d-4cfe-90af-5bf8d94845be" + "ID": "bee19115-020f-4c50-8e0b-4a87f2e00ef3" } ] } ], - "ID": "82029e6a-99c0-49a5-9646-0fc534133b8b" + "ID": "6f0e4d07-319b-4f31-8384-aa5b2f618f5f" }, { "CommandList": [ @@ -1108,7 +1364,7 @@ "Message": "成员不在任务内，无法报工！" } ], - "ID": "58aede58-95c2-47ac-a465-d08f0a32da5c" + "ID": "60999756-b879-4cc0-93c2-1658179e46f2" } ] } diff --git a/ServerCommands/项目/新增或修改项目.json b/ServerCommands/项目/新增或修改项目.json new file mode 100644 index 00000000..bd683d6a --- /dev/null +++ b/ServerCommands/项目/新增或修改项目.json @@ -0,0 +1,866 @@ +{ + "Name": "新增或修改项目", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "ID", + "DataValidationInfo": {} + }, + { + "Name": "封面", + "DataValidationInfo": {} + }, + { + "Name": "项目名称", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "项目简介", + "DataValidationInfo": {} + }, + { + "Name": "项目方案", + "DataValidationInfo": {} + }, + { + "Name": "预算方案", + "DataValidationInfo": {} + }, + { + "Name": "所属客户", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "所属客户部门", + "DataValidationInfo": {} + }, + { + "Name": "管理员", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "工时核定方式", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "权限", + "DataValidationInfo": {} + }, + { + "Name": "分组", + "DataValidationInfo": {} + }, + { + "Name": "预算工时", + "DataValidationInfo": {} + }, + { + "Name": "预算金额", + "DataValidationInfo": {} + }, + { + "Name": "严格模式", + "DataValidationInfo": {} + }, + { + "Name": "开始日期", + "DataValidationInfo": {} + }, + { + "Name": "结束日期", + "DataValidationInfo": {} + }, + { + "Name": "网络资源", + "DataValidationInfo": {} + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "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.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "d789054a-705a-48a4-8eb6-909c8245d8a2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目名称" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目简介", + "GUID": "304c8e44-8048-46e4-b2c1-8c11042d535d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目简介" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目封面", + "GUID": "a1b25d5f-6e92-4618-8bbc-91e616972a74" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=封面" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "5ca1ef62-9af5-4455-9977-5f623bea1241" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=管理员" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目分组", + "GUID": "3fbc301c-7a1c-4bde-b99b-1d8768a03ca6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分组" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "所属客户", + "GUID": "b7bffd3a-ee4d-434b-a709-b48b3a8436c1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=所属客户" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "所属客户部门", + "GUID": "ee8ba706-1a9f-4822-a5ca-3805c1309893" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=所属客户部门" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "工时核定方式", + "GUID": "9f70eec9-8a7f-43c4-b9fb-809711b6fb91" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时核定方式" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目预算工时", + "GUID": "6a35b2f1-1d4f-4c62-9d4e-ee9ac4a263b5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算工时" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目预算费用", + "GUID": "c8d40ab7-529a-42d0-8e51-544ec00fa861" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算金额" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "公开", + "GUID": "86d2976c-aa02-4f34-b8b5-87fab4176c2f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=权限" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "严格模式", + "GUID": "fdf59c78-310c-4dc8-bcf7-658e413f21ab" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=严格模式" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目方案", + "GUID": "2ffc1113-d22f-431f-9575-aa26f842b24d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目方案" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "预算方案", + "GUID": "68a709b4-8855-4cab-94c0-1a53526a445d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算方案" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "计划开始日期", + "GUID": "cacd203d-aaa6-44bd-b326-156a3403919d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开始日期" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "计划完成日期", + "GUID": "590db402-19fb-4c45-8b80-30e15e32cb57" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=结束日期" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "网络资源", + "GUID": "41c9ff18-6fd7-4c5c-980e-e8d789132770" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=网络资源" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目状态", + "GUID": "b2a367b5-d63b-4dd7-8074-c1ae6ba65314" + }, + "Value": "0" + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "删除", + "GUID": "8b5ece8c-48c3-42e9-b041-0274e710d9db" + }, + "Value": "0" + } + ], + "ParamNameToSaveNewRowValue": "新项目" + }, + { + "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", + "ProcessDefinitionResourceName": "立项流程", + "ProcessInstanceName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目名称&\"立项审批\"" + }, + "SelectedTable": "项目表", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "2aeae676-f1b4-4bfd-bfa9-12ec0f173380" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新项目.ID" + } + }, + "Initiator": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=管理员" + }, + "ReturnResultName": "发起流程结果" + }, + { + "$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": "%Null%", + "compareType": 1 + }, + { + "$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": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "项目创建成功，请等待审批" + } + ], + "ID": "144671ba-cc32-438f-af46-e141f0c353c9" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "项目已创建，但未能发起审批，请手动发起审批流程！" + } + ], + "ID": "4219b6b1-bf48-403d-a253-906f2fff5cec" + } + ] + } + ], + "ID": "78fb41d1-913a-47dc-a7ac-08b6379b6870" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目信息", + "TableValue": { + "TableName": "项目表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "严格模式", + "GUID": "b8486155-4f64-4dd8-b85c-16543680907f" + }, + "ColumnName": "严格模式" + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "工时核定方式", + "GUID": "394415d4-b1ba-4c8e-851a-0e427e1ec361" + }, + "ColumnName": "工时核定方式" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "2c0631c8-c61b-431a-bdf4-13f968834089" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "7d341adfdcbd425a8fea4594af49b2e9" + }, + { + "$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": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.工时核定方式" + } + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目统计信息", + "TableValue": { + "TableName": "View_项目统计信息", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算工时", + "GUID": "020613fe-5e4a-47bc-82ee-e2ede6fb5737" + }, + "ColumnName": "项目预算工时" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算费用", + "GUID": "b5e66ce2-c04f-45e2-9ef8-cb6f1be2534d" + }, + "ColumnName": "项目预算费用" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总核定工时", + "GUID": "712fd696-cb7a-4afe-ab22-c22061fd0c83" + }, + "ColumnName": "总核定工时" + }, + { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总成本", + "GUID": "82679dce-9071-486f-9eb5-9a36171e90a2" + }, + "ColumnName": "总核定成本" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目ID", + "GUID": "ecc83868-39ca-446f-afde-d95c38fe55d5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + "TopCount": "1" + }, + "ID": "c9d76c19accd4bdb9637342bd8efe42f" + }, + { + "$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": "计划" + }, + { + "$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 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"无法为您切换为严格模式，因为你要求按\"&工时核定方式&\"工时来核定成本，但项目工时此时已经超标！\"" + } + } + ], + "ID": "0d133ce7-06f7-4678-8a0b-e708636d7f62" + }, + { + "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": "实际" + }, + { + "$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 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"无法为您切换为严格模式，因为你要求按\"&工时核定方式&\"工时来核定成本，但项目费用此时已经超标！\"" + } + } + ], + "ID": "6915f6a5-544a-4494-a3a1-275f1e67256d" + } + ] + } + ], + "Comments": "如果是更新项目，且改变了工时核定方式、严格模式，那么就要校验。超标就不允许切换", + "ID": "6c18ae88-cdb1-4b49-9d5c-a52fa713b0e8" + } + ] + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "a8a27903-2609-49d7-8f9c-318870a24d2a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "d86f9206-3342-4ed2-b561-4b3cddb33579" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目名称" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目简介", + "GUID": "c8c387b4-a86d-4e0c-bd4e-c0ffb03b8b7e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目简介" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目封面", + "GUID": "2ab448ad-6d8a-4215-af51-b3978fd23077" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=封面" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "f6ed5ea6-d803-4991-bf54-08b29889a6c0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=管理员" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目分组", + "GUID": "5c70da10-1fe1-473f-9abb-9ea5c2b70498" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=分组" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "所属客户", + "GUID": "03e20733-6451-4018-b51a-0107ce0a98b2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=所属客户" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "所属客户部门", + "GUID": "17c99024-ddeb-404e-aa45-a60acfc53fab" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=所属客户部门" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "工时核定方式", + "GUID": "020b5096-5705-4b0b-9a6e-e7a59da2e25b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工时核定方式" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "公开", + "GUID": "695bed47-145c-4876-802d-3e97df9e4a21" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=权限" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "严格模式", + "GUID": "b6897f1f-e70c-4f8e-b733-5b927a3cb191" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=严格模式" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "计划开始日期", + "GUID": "7baffe04-7c4a-4ce9-ab22-49c4e0a46211" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开始日期" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "计划完成日期", + "GUID": "d60ca66a-d1e8-4310-83e4-f0ea077cc89d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=结束日期" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目方案", + "GUID": "f44d7a80-bfb3-4f8f-8fb7-8c266a283cab" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目方案" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "预算方案", + "GUID": "438bd730-d6b2-46fc-814c-f7cb51eedbaf" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算方案" + } + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "网络资源", + "GUID": "dea2f069-b6fa-4052-adff-5158cd68670a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=网络资源" + } + } + ] + } + ], + "ID": "34654d41-a858-49cc-83f2-282414978f42" + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + } + ] + } + } + ] +} \ No newline at end of file diff --git a/ServerCommands/项目/新增项目.json b/ServerCommands/项目/新增项目.json deleted file mode 100644 index e0b92499..00000000 --- a/ServerCommands/项目/新增项目.json +++ /dev/null @@ -1,447 +0,0 @@ -{ - "Name": "新增项目", - "Enabled": true, - "Triggers": [ - { - "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", - "Permission": { - "PermissionData": { - "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", - "permissionResource": { - "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" - }, - "permissionBindings": [ - { - "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", - "roleNames": [ - "FGC_LoginUser" - ] - } - ] - } - }, - "Parameters": [ - { - "Name": "封面", - "DataValidationInfo": {} - }, - { - "Name": "项目名称", - "DataValidationInfo": { - "IgnoreBlank": false - } - }, - { - "Name": "项目简介", - "DataValidationInfo": {} - }, - { - "Name": "项目方案", - "DataValidationInfo": {} - }, - { - "Name": "预算方案", - "DataValidationInfo": {} - }, - { - "Name": "所属客户", - "DataValidationInfo": { - "IgnoreBlank": false - } - }, - { - "Name": "所属客户部门", - "DataValidationInfo": {} - }, - { - "Name": "管理员", - "DataValidationInfo": { - "IgnoreBlank": false - } - }, - { - "Name": "工时核定方式", - "DataValidationInfo": { - "IgnoreBlank": false - } - }, - { - "Name": "权限", - "DataValidationInfo": {} - }, - { - "Name": "分组", - "DataValidationInfo": {} - }, - { - "Name": "预算工时", - "DataValidationInfo": {} - }, - { - "Name": "预算金额", - "DataValidationInfo": {} - }, - { - "Name": "严格模式", - "DataValidationInfo": {} - }, - { - "Name": "开始日期", - "DataValidationInfo": {} - }, - { - "Name": "结束日期", - "DataValidationInfo": {} - } - ] - } - ], - "Commands": [ - { - "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", - "TryCommandPart": { - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目名称", - "GUID": "7d44e7fb-2f57-4398-9913-47c13ba3ede5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目名称" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目简介", - "GUID": "c0dbc623-caa8-48a9-853e-293b121d02ba" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目简介" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目封面", - "GUID": "c4986896-874c-4390-b1d9-1fd3c4d5aa4f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=封面" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目经理", - "GUID": "a27309e7-9b4f-4a4e-b40f-e486f13cd648" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=管理员" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目分组", - "GUID": "c6663b7e-52d8-4ef1-94de-eeb8b4b01a62" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=分组" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "所属客户", - "GUID": "d411c883-4d33-4c77-84ad-1166308cdd2a" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=所属客户" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "所属客户部门", - "GUID": "35d5b962-ac5e-4436-bf26-c1f7b3be283b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=所属客户部门" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "工时核定方式", - "GUID": "c103543f-0857-4ce1-847e-e430e5c30a26" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时核定方式" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目预算工时", - "GUID": "27fe208a-5383-4b1a-bb93-975731a1439b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算工时" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目预算费用", - "GUID": "eba047f9-6322-4098-a2bf-4ea0241b40f9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算金额" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "公开", - "GUID": "e47f39ff-3c43-4eab-86c8-06e7357398b7" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=权限" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "严格模式", - "GUID": "a7ec3bb1-3012-42b3-a783-7cbb6126189d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=严格模式" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目方案", - "GUID": "008ecc95-dd41-4f4b-8467-a2bf4d528c1d" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目方案" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "预算方案", - "GUID": "ac909c75-9860-4acb-a13d-f51ff4a1c194" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算方案" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "计划开始日期", - "GUID": "6b917f28-f2ad-4cd0-9279-559d645a68a1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开始日期" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "计划完成日期", - "GUID": "536387b2-3798-4f9a-b908-81be340772cc" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=结束日期" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "计划工期", - "GUID": "bab97b96-79f6-4933-8512-f1e81f7871eb" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")" - } - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目状态", - "GUID": "883a98a1-c130-45fe-ba21-41e4b89720b6" - }, - "Value": "0" - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "删除", - "GUID": "08d83ec3-6999-4c9e-bb0f-b4d27faa6567" - }, - "Value": "0" - } - ], - "ParamNameToSaveNewRowValue": "新项目" - }, - { - "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", - "ProcessDefinitionResourceName": "立项流程", - "ProcessInstanceName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目名称&\"立项审批\"" - }, - "SelectedTable": "项目表", - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "2aeae676-f1b4-4bfd-bfa9-12ec0f173380" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新项目.ID" - } - }, - "Initiator": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=管理员" - }, - "ReturnResultName": "发起流程结果" - }, - { - "$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": "%Null%", - "compareType": 1 - }, - { - "$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": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "d7f9fab2-4b0f-482a-ac2e-73d7385293bc" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新项目.ID" - } - }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "立项流程示例ID", - "GUID": "8d753fcc-7af7-4cf2-9e4b-d33e6a7acb60" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起流程结果.ID" - } - } - ] - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "项目创建成功，请等待审批" - } - ], - "ID": "c3a57801-8218-4fea-96ee-d5d1a4ba03dd" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "项目已创建，但未能发起审批，请手动发起审批流程！" - } - ], - "ID": "ca82d067-c2e4-494f-bda6-6a258d2fa2df" - } - ] - } - ] - }, - "CatchCommandPart": { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ExceptionCode" - }, - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ExceptionMessage" - } - } - ] - } - } - ] -} \ No newline at end of file diff --git a/Tables/项目/项目岗位.json b/Tables/项目/项目岗位.json index 06b39228..a58866a7 100644 --- a/Tables/项目/项目岗位.json +++ b/Tables/项目/项目岗位.json @@ -25,6 +25,13 @@ "Name": "岗位名称", "ColumnType": "System.String, 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" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "float", diff --git a/Tables/项目/项目表.json b/Tables/项目/项目表.json index a23651ca..50f121ae 100644 --- a/Tables/项目/项目表.json +++ b/Tables/项目/项目表.json @@ -185,7 +185,7 @@ "立项流程示例ID": 5, "网络资源": 5, "计划完成日期": 5, - "计划工期": 5, + "开始及完成时间": 5, "计划开始日期": 5, "项目分组": 5, "项目名称": 5, @@ -197,7 +197,8 @@ "项目经理": 5, "项目预算工时": 5, "项目预算费用": 5, - "预算方案": 5 + "预算方案": 5, + "计算计划工期": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -237,7 +238,7 @@ "立项流程示例ID": 5, "网络资源": 5, "计划完成日期": 5, - "计划工期": 5, + "开始及完成时间": 5, "计划开始日期": 5, "项目分组": 5, "项目名称": 5, @@ -249,7 +250,8 @@ "项目经理": 5, "项目预算工时": 5, "项目预算费用": 5, - "预算方案": 5 + "预算方案": 5, + "计算计划工期": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -289,7 +291,7 @@ "立项流程示例ID": 5, "网络资源": 5, "计划完成日期": 5, - "计划工期": 5, + "开始及完成时间": 5, "计划开始日期": 5, "项目分组": 5, "项目名称": 5, @@ -301,7 +303,8 @@ "项目经理": 5, "项目预算工时": 5, "项目预算费用": 5, - "预算方案": 5 + "预算方案": 5, + "计算计划工期": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -439,13 +442,6 @@ "Name": "计划完成日期", "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "bigint", - "MaxLength": -1, - "Name": "计划工期", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.AttachmentBindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", @@ -523,6 +519,18 @@ "Name": "参与人统计", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "[计划开始日期]&\",\"&[计划完成日期]", + "Name": "开始及完成时间", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", + "Formula": "DATEDIF([计划开始日期],[计划完成日期],\"d\")", + "Name": "计算计划工期", + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index 68194788..9463861b 100644 Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ