diff --git a/.collaboration b/.collaboration index 5ab86d44..9d4e8d83 100644 --- a/.collaboration +++ b/.collaboration @@ -141,16 +141,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T15:19:01.7426594+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目标题.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", @@ -596,16 +587,7 @@ }, { "ModuleName": "PCPage/项目信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T15:07:51.2767312+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目信息.json" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/删除任务成员所有工时", @@ -625,16 +607,7 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T16:51:59.8775095+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目概况.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员统计", @@ -718,30 +691,11 @@ }, { "ModuleName": "PCPage/FGC_审批记录", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T16:26:06.3013311+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_审批记录.json", - "Pages\\a9dda523558c44c189c02319d3d55b4.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_任务详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T15:17:09.6696603+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\流程页面文件夹\\FGC_任务详情.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_我发起的", @@ -833,16 +787,7 @@ }, { "ModuleName": "Table/项目预算变动表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T16:33:29.8212286+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目预算变动表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Image/时间.svg", @@ -852,71 +797,17 @@ "ModuleName": "ServerCommand/修改增补工时状态", "ModuleType": 15 }, - { - "ModuleName": "ServerCommand/新增项目工时增补", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T16:45:10.6899523+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\新增项目工时增补.json" - ] - }, - { - "ModuleName": "ServerCommand/应用项目增补工时", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T15:14:59.1092992+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\应用项目增补工时.json" - ] - }, { "ModuleName": "PCPage/预算申请", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T16:33:29.8214493+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\预算申请\\预算申请.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/预算申请审批", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T16:33:29.8214653+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\预算申请\\预算申请审批.json" - ] + "ModuleType": 1 }, { "ModuleName": "ProcessItem/预算申请", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T16:33:29.8215443+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\预算申请.json", - "Process\\预算申请.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "Pages/项目首页/预算申请", @@ -924,22 +815,10 @@ }, { "ModuleName": "ServerCommand/批准项目预算申请", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T16:33:29.8215395+08:00", "ModuleType": 15 }, { "ModuleName": "ShareCommandContainer/发起预算申请", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T16:35:35.4805958+08:00", "ModuleType": 36 } ] \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_任务详情.json b/Pages/流程页面文件夹/FGC_任务详情.json index e84cb0b0..99997615 100644 --- a/Pages/流程页面文件夹/FGC_任务详情.json +++ b/Pages/流程页面文件夹/FGC_任务详情.json @@ -3,7 +3,7 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 24.0 } }, "1": { @@ -18,316 +18,98 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0, + "Mode": 1 } }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 24.0 } }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 20.0 } }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 20.0 } }, "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "21": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "22": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "23": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "24": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "25": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "28": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } } }, "InLogicalVisibleIndexes": [ - 30, - 31, - 32 + 17, + 18, + 19 ], - "Count": 33 + "Count": 20, + "DefaultSize": 32.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -338,535 +120,161 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "23": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0, + "Mode": 1 } }, "24": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 } }, "25": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "IsHidden": true } }, "26": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 303.0, + "Mode": 1, + "IsHidden": true } }, "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "28": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "30": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "31": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "32": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "33": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "34": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "35": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "36": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "37": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "38": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "39": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "40": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "41": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "42": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "45": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "46": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "48": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "49": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } } }, - "Count": 59 + "InLogicalVisibleIndexes": [ + 25, + 26 + ], + "Count": 28, + "DefaultSize": 32.0 }, "Values": { - "0,43": "FGC_审批记录", + "0,26": "FGC_审批记录", "1,1": " ", - "3,1": "", - "28,22": " " + "3,1": "" }, "Formulas": { - "3,1": "IF(ISBLANK(B32),L32&\"\",B32)" + "3,1": "IF(ISBLANK(B19),F19&\"\",B19)" }, "AttachInfos": { - "0,43": { + "0,26": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "FGC_审批记录" @@ -875,7 +283,26 @@ "1,1": { "CellType": { "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon", + "PreCommands": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_任务详情!关联页面" + }, + "Title": "加载中" + } + ], "PostCommands": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_任务详情!关联页面" + }, + "Title": "加载中" + }, { "$type": "Forguncy.Model.IgnorePageDirtyCommand, ServerDesignerCommon" }, @@ -901,7 +328,7 @@ "PageName": "FGC_我的待阅" } ], - "ID": "3c60bc45-9b07-45c3-bf30-3681f913886a" + "ID": "e2da7f5e-71f3-421e-96cb-84fe0ff5616e" }, { "CommandList": [ @@ -910,7 +337,7 @@ "PageName": "FGC_我的待办" } ], - "ID": "475b3312-30c6-461a-b3e9-7d502112a088" + "ID": "8c699776-62fc-47f2-8418-86e974934939" } ] } @@ -930,6 +357,32 @@ ] } }, + "1,24": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_任务详情!O19" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT(FGC_任务详情!O19)" + } + } + ] + } + ], + "ToolTip": "显示/隐藏审批记录", + "Size": 18, + "ImagePath": "展开.svg", + "UseCellForeColor": true + } + }, "3,1": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", @@ -937,19 +390,43 @@ "OverflowMode": 1 } }, - "31,1": { + "18,1": { "BindingInfo": { "TableName": "ACT_RU_TASK_View", "ColumnName": "FORM_KEY_", "GUID": "69d83c0e-382b-4cd5-9844-ac5940471aa2" } }, - "31,11": { + "18,5": { "BindingInfo": { "TableName": "ACT_HI_TASKINST_View", "ColumnName": "FORM_KEY_", "GUID": "b36dd51f-0d87-4eb2-a0e7-a29391eb6496" } + }, + "18,14": { + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "Caption": "显示审批记录", + "Style": 1, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_任务详情!Z:AA" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_任务详情!O19" + } + } + ] + } + ] + } } }, "StyleDatas": { @@ -959,6 +436,9 @@ "Formatter": 1, "HorizontalAlignment": 2 }, + { + "BorderRight": 0 + }, { "FontFamily": 0, "BorderBottom": null, @@ -966,9 +446,6 @@ "BorderLeft": null, "BorderRight": null }, - { - "BorderRight": 0 - }, { "FontFamily": 0 }, @@ -984,13 +461,6 @@ "BorderTop": null, "BorderLeft": null, "BorderRight": null - }, - { - "HorizontalAlignment": 4, - "BorderBottom": null, - "BorderTop": null, - "BorderLeft": null, - "BorderRight": null } ], "Types": { @@ -1009,124 +479,64 @@ }, "CellStyles": { "1,1": 0, - "1,17": 1, - "1,18": 1, - "1,19": 1, - "1,42": 2, - "2,1": 1, - "2,2": 1, - "2,3": 1, - "2,4": 1, - "2,5": 1, + "1,25": 1, + "2,1": 2, + "2,2": 2, + "2,3": 2, + "2,4": 2, + "2,5": 2, "2,6": 3, "2,7": 3, "2,8": 3, - "2,9": 1, - "2,10": 1, + "2,9": 2, + "2,10": 2, "2,11": 3, - "2,12": 1, - "2,13": 1, - "2,14": 1, - "2,15": 1, - "2,16": 1, - "2,17": 1, - "2,18": 1, - "2,19": 1, + "2,12": 2, + "2,13": 2, + "2,14": 2, + "2,15": 2, + "2,16": 2, + "2,17": 2, + "2,18": 2, + "2,19": 2, "2,20": 3, - "2,42": 2, + "2,25": 1, "3,1": 3, - "3,42": 2, - "4,42": 2, - "4,58": 4, - "5,42": 2, - "5,58": 4, - "6,42": 2, - "6,58": 4, - "7,42": 2, - "7,58": 4, - "8,42": 2, - "8,58": 4, - "9,42": 2, - "9,58": 4, - "10,42": 2, - "10,58": 4, - "11,42": 2, - "11,58": 4, - "12,42": 2, - "12,58": 4, - "13,42": 2, - "13,58": 4, - "14,42": 2, - "14,58": 4, - "15,42": 2, - "15,58": 4, - "16,42": 2, - "16,58": 4, - "17,42": 2, - "17,58": 4, - "18,42": 2, - "18,58": 4, - "19,42": 2, - "19,58": 4, - "20,42": 2, - "20,58": 4, - "21,42": 2, - "21,58": 4, - "22,42": 2, - "22,58": 4, - "23,42": 2, - "23,58": 4, - "24,42": 2, - "24,58": 4, - "25,42": 2, - "25,58": 4, - "26,42": 5, - "26,58": 4, - "27,42": 5, - "27,58": 4, - "28,0": 6, - "28,1": 6, - "28,2": 6, - "28,3": 6, - "28,4": 6, - "28,5": 6, - "28,9": 6, - "28,10": 6, - "28,12": 6, - "28,13": 6, - "28,14": 6, - "28,15": 6, - "28,16": 6, - "28,17": 6, - "28,18": 6, - "28,19": 6, - "28,21": 6, - "28,22": 6, - "28,23": 6, - "28,24": 6, - "28,25": 6, - "28,27": 6, - "28,28": 6, - "28,29": 6, - "28,30": 6, - "28,33": 6, - "28,34": 6, - "28,35": 6, - "28,36": 6, - "28,37": 6, - "28,38": 6, - "28,40": 6, - "28,41": 6, - "28,42": 3, - "28,58": 7, - "29,42": 3, - "29,58": 4, - "30,42": 3, - "30,58": 4, - "31,42": 3, - "31,58": 4, - "32,42": 3, - "32,58": 4 + "3,25": 1, + "4,25": 1, + "4,27": 4, + "5,25": 1, + "5,27": 4, + "6,25": 1, + "6,27": 4, + "7,25": 1, + "7,27": 4, + "8,25": 1, + "8,27": 4, + "9,25": 1, + "9,27": 4, + "10,25": 1, + "10,27": 4, + "11,25": 1, + "11,27": 4, + "12,25": 1, + "12,27": 4, + "13,25": 1, + "13,27": 4, + "14,25": 1, + "14,27": 4, + "15,25": 5, + "15,27": 4, + "16,25": 3, + "16,27": 4, + "17,25": 3, + "17,27": 4, + "18,5": 3, + "18,13": 6, + "18,25": 3, + "18,27": 4, + "19,25": 3, + "19,27": 4 }, "SheetStyle": { "FontFamily": 0, @@ -1137,16 +547,25 @@ } }, "Spans": [ - "1,1,1,41", - "3,1,25,41", - "0,43,29,15", - "31,1,1,9", - "31,11,1,9" + "3,1,13,24", + "0,26,16,1", + "1,1,1,23", + "18,1,1,4", + "18,5,1,5", + "18,14,1,4", + "18,10,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "MobilePageName": "FGC_任务详情_手机版", "Title": "任务详情", + "PageLoadedCommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + } + ], "AuthorizeInfo": { "VisitMode": 2 }, @@ -1170,8 +589,18 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "866,0", - "Size": "274,554" + "Location": "814,0", + "Size": "297,462" + } + ], + "CustomNames": [ + { + "Name": "传参1", + "Formula": "FGC_任务详情!$K$19" + }, + { + "Name": "关联页面", + "Formula": "FGC_任务详情!$B$4" } ] -}//xsiru17Jeh+877zvbQRdfb4YjKTk4PsphRPCDrRLqFimPJ/Q2g0gqUTF+T38/C4XRNem0PN6bR3uDV+PC3SVZcn5NxajtL5I/HHqUVHR/GmuK0fH6Ms+bdROMNAd+dLwzgGl9SSitVameTZQSUuCu1nUxDZETn4wIMMv5u08sRi3Ki1YItJco+eSmKYSUx+uo6BJNWQkksci0ii/bJyKGZJuiNgOO4xVSZ3IDKZVzuv0rf39qwWaIWCeX4cAhpal4PQu7nQShUtXV9hVByoxxomliBqkaNQMZcK67ZZc9giRg01baeSm9obDUu1wuIdDI/GsixdI5s/URzFdJgY0Ni6fpK78uGv8QoZ69ML2m+js9QINSO6mD5jPT7Lp0UBJZsQapLPiOiCapLdrpVYYG4KnZXe5IR6hCzlWTS4rzHmuyDrAbF9/M0fV4IG8GzTtqEiGWCqI2j7rVPHqcD0acu/Du+QAqMh/OtVlBscqZIXK4EKuv/q6gwjRfhRO19JAuUPwUzE2dWQA/PogLUCayvUWwj0b0VOgBWkOuWD2WnwKK13n30JBroDaOGlE72wnqhhBkVVQ1CLn5xinsez0sxptLZsYsU+cWMoIVPK3PBlcD+U/PRNI6rA5MV0tmQmaCgU0XhdS+SEm51+PfuZrEs+in1bKbPqccOcQf7fyQBnkPrBTLj0cVXkY28BDw3xbdyhXRBOCcRpnoYkaQZZJ058wMVN1xN1FEckND7N/KaFM1u/kJkBjcP05ImeFTIYVzFXHLmJhXGkZvhuZ+7HKYqUfgsrwKt8sAdAafrX4g/vqhgW0L6Slpsqc/SWclRPxYryIkTgOCkv7r1NN7FpYIWnbd8wE9/Wdb5rg1eIYYmQ9O9CsEkLP7h6PCc/TI092MpLFJWKFAH88xyXCpW3R6g==|920 \ No newline at end of file +}//xKlAGEeiUe1un8oCeFtm/fScNUAwS5nxafXmNjhuWrK986RcWM0hPD2G1QZ2PSIrrRUbEfCeosbAvu/HmP+6D1DQrn9BOChIED3P339+acUaiaifkMo+4eNAxRuolh2PNx21rNhVF9VmLrovGjcfzQ3LsCufTIFL43be0/dTD1th+FzgnFAMRl0szHehlEIw3KjGTB0q1Oamf5m82byaABJ++Iuq+YqO/Zo0vHXKYLPtX6Rd5vCDz+/RrKAMnhZht43QuRsWuvtVVDJAaaKUkzy62CRFDlROoRhzhuYNGxZCt1pzqK8ggE/rbajM2Ri0ZAHYa81gVLRvfvTmYEFVSq5bHVoJiRL7u/zC9Pkzihs1HPzDFHN5r/AnE3lMXgB8H/81QloUCxYif7Fk9VFyZLXg264pQ2C2jfrOF2Hg/1fLynxGlKjL4tKL/P7kjHC4EorefxDM9VKG8KqgjMxA4gLAzdIc7O93pb9jTP3NHuEufNuzTOIhcWIeM7H7CFMQfyVo3fGYW9UyV1Qr7EWNkC1aLdEG6rnYLMr8hOw94daPVINFN1ScKwhh7L26vT0D2groNDq0cW8Ylj69ZsgVdy+QoiwI4xmREKgQSFmeqtlwt76RpT9S1nXQuqs11RP2C8AKhsrnbckx1ITpt+lM3omj35yE49a0ObV8y+AnTodXxp7uQUtuy/oesfLYs7Jkz3rQuPKFqpESsmLppmQh9S32vNd/czLtSg6jUP9HYwUFbfj3uS+7fGlxkaxS7KurKBlqVKBf84A8o4ft2Qt8GyzQQBoKgku4XyjGb40uFiNEeTQq8HEEnxoWcu2xwl1ZHKs8h7tAScLc96a2RA0Z7ZZ1memL94j9Iz5/kMO1Xdm2KbfVKdecxZycA+PsFmKuhx7vrmetpsgVMhW3lGg6SA==|920 \ No newline at end of file diff --git a/Pages/流程页面文件夹/FGC_审批记录.json b/Pages/流程页面文件夹/FGC_审批记录.json index c429f83e..53b8e5af 100644 --- a/Pages/流程页面文件夹/FGC_审批记录.json +++ b/Pages/流程页面文件夹/FGC_审批记录.json @@ -401,86 +401,37 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 20.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 20.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 20.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 20.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 20.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 20.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 20.0 } }, "9": { @@ -756,7 +707,7 @@ }, { "FontFamily": 0, - "FontSize": 14.666666666666666, + "FontSize": 13.333333333333332, "HorizontalAlignment": 4, "Underline": false, "BorderBottom": null, @@ -1202,4 +1153,4 @@ "PaperSize": {}, "Margin": {} } -}//alrr5PICkc0Ou+IH7d82rv6rNyPMMGO2AXwnmKMINSuWnopXHf66Nlz8fkWFc8USojkTprknLJpV6N1NROgplj/rV656GtVVWeGIavekJOzgh/hJkCw1aorMoREWep7SDyw3QM7DsmbN8i2S2MoXBf58ErEL6k/HKRcUSr3Fsvyy+tmR4QmyHdO/7yolECLs3FwYgAUKX5pGjiYd0JJNL3lOYPgRZijczGEE5GFSTHoqIHl/RgN+3sjDpqIWPvbLrbxcQ4UTxSxXWG+nxz9HssfEdFR5AAKi0l+OEqjM9rE5fpcw+CFbCjx1cq7kqiYZNbyto5LoYuVaocRyXuQYwpJlJGrT1nqjeey8QVq+LnjOLeWZt8ipILl/DP8xDOP5s/q52l1lFgF2PuWe1uXt9/HE0CpZ2808WRJR0TUdXzcmG3+4InEGlJcH2KA+yf8XBtGMlazbuWp8rWHuSe5xKv0yWeeRaMm4QvU8NDjoi1mcUv+bnuEW9YshBR1P8s0r3wTn9CqIXT/LCuqq+gfdnuOIibYY7mbAnBpOecFsEQm/dZX+U2bra8/GbEVX6kfE3MyUtFKqGAz1M3khg40/k57hosx/j5QnGnh31VsG2mCENi+JL/OWXHe1i1RnNQMWnOFHDel6sPfkPUJvkLj6kGPq5JVR4t0SmRz2zT5Ik5sRehWZ/6NyrZ2NDNsJTZ5oPNMMxInnrsL5HspJYibs38fb4OU4i4GyKdcGJGaB83+Gjeb75xs7iyVA51/3oXovh2yCqGjtkv/5Wl3bWCh323m4J3KDABodLFEimbkV8vkKUzN2zMai1DMB+OlrPBu4Mml6aGuXg0d4HSlV7g8N2DyNw+wN40XycgD7g7+1BtddN0zl0H1dxNtaLXJSpsI3a1RyFPzRqwmw/6lnqkoJew==|920 \ No newline at end of file +}//0RjDyQtafL/75YrCr0ctXMPr+JtgMjvqMpQodeIivGOqm8kiHldXQJLlid2IyXGMfBp8tZa//HEUrvBgieLXH4VwOmdCUDREkFG6moaqHScpwV5IaJQVEjq6pfSmBCR3/q9oEE2wqF0xHQv0JfJq4sne/70fd1OgwEQhptATsIM5EOv+JL6mB+yGLjk7+tYNdD3X78KljXy0o5WJitKSFcJgI3edza6ehMYQQpDvQmaLxV6EzJLiRKrw1V00AhnskKjYUQFwettwCFgazMAossyMvzLOzgaYQS9UoLjVypyKaUcJY4Ye5vk+iXIk/K71q0z0MhlvseuuDRdlnvjx90ZfH4MNbfYuro4zD5zK/rPCx4mQxJtfSPY2MQuNDavL562pqcknosjtN2sByKvxH0o67Bhdk03pyK8nPNRaO8gtdd1jwaUGQbINiqnBIVxGCju+zFPcrufrpkmPXW8i/Ba5iSsXf6f9QQr4oi7LzjKDCz+3DlV6EdRlgk02Uz7AGQAUbeJziuA5pbWc9Qe3QieRB9xtphY32IpW/clnbNPHS10Ybjw39ZggJkhSuqX6ZIrmn/SlqQM+bV9XAiLnuO/Wz2J33clIhGRuFiwZnNxvtQ0IzZok0nsChSHD3CeAp/ARKBDZ+vfBcxjMgPSes1vdiVnWpJCzSVOkzUZzSkTZGz2kBlycikelH17c09J2BWCX0Sglute9SwfrRFaF+GbYRhYbFqzrlwLRcIMfR+0XwD1LR1x7GylQe1NFJ0CFdrCOhU1v0GwgQMpM6KHO5Us5eePPslvVGpYEzEuCTrYjaebyhuSAt6ZUVCmfk6b5QAw889m+JJgn1zX1CcWWCpGxr8XCe6coOauGeopX4K3mqj/bPd8MgYGlkWTNUWiNiqF802AJX7fwxZac4N2TPw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目信息.json b/Pages/项目首页/项目信息.json index d0b4083b..59c5e0fe 100644 --- a/Pages/项目首页/项目信息.json +++ b/Pages/项目首页/项目信息.json @@ -37,6 +37,11 @@ "Mode": 1 } }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, "8": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -47,6 +52,11 @@ "DesignLengthInPixel": 32.0 } }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -112,6 +122,11 @@ "DesignLengthInPixel": 32.0 } }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 81.0 + } + }, "25": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 @@ -122,6 +137,11 @@ "DesignLengthInPixel": 32.0 } }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 81.0 + } + }, "28": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -142,26 +162,6 @@ "DesignLengthInPixel": 32.0, "IsHidden": true } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "24": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 81.0 - } - }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 81.0 - } } }, "InLogicalVisibleIndexes": [ @@ -837,11 +837,47 @@ "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "DrawerDirection": 3, - "ShowDrawerHeader": true, - "PageName": "预算申请", - "LoadBindingDataOption": 1 + "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", + "ProcessDefinitionResourceName": "预算申请", + "ReturnResultName": "发起流程结果" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目信息!发起流程结果.TaskExists" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "FGC_任务详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=FGC_任务详情!项目ID" + } + } + ] + } + ], + "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面", + "ID": "7b4a4cc9-e586-4a9c-b114-42a915ab7c9b" + } + ] } ], "ToolTip": "增补工时", @@ -855,11 +891,47 @@ "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "DrawerDirection": 3, - "ShowDrawerHeader": true, - "PageName": "预算申请", - "LoadBindingDataOption": 1 + "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", + "ProcessDefinitionResourceName": "预算申请", + "ReturnResultName": "发起流程结果" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目信息!发起流程结果.TaskExists" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "FGC_任务详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=FGC_任务详情!项目ID" + } + } + ] + } + ], + "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面", + "ID": "5ff5c059-b0da-4a5d-84c3-bb6abb2f5219" + } + ] } ], "ToolTip": "增补费用", @@ -1060,6 +1132,7 @@ ] } ], + "UploadLimit": {}, "Folder": "%CurrentUser%", "KKFileViewExtensions": "(doc|docx|xls|xlsx|ppt|pptx)", "LayoutMode": 4, @@ -1094,6 +1167,7 @@ ] } ], + "UploadLimit": {}, "Folder": "%CurrentUser%", "KKFileViewExtensions": "(doc|docx|xls|xlsx|ppt|pptx)", "LayoutMode": 4, @@ -1301,7 +1375,7 @@ "ReloadData": true } ], - "ID": "29790bd8-a983-4302-be82-3aba6818bec7" + "ID": "5c8aee71-d800-4228-bdfb-1233da24c628" }, { "CommandList": [ @@ -1316,12 +1390,12 @@ "BtnText": "知道了" } ], - "ID": "382eb499-b9be-4086-be10-866bbefed401" + "ID": "477f3bf9-3e87-4454-92a6-bfc0c6dd4ae7" } ] } ], - "ID": "5dd1f50d-bf3c-4caf-85bd-ebc337c1326e" + "ID": "2633f00c-c3e5-4baa-a69b-dc83b889ef03" }, { "CommandList": [ @@ -1339,7 +1413,7 @@ "ReloadData": true } ], - "ID": "975f617f-26b4-406c-b61d-60ac2164fd3d" + "ID": "707d99af-aec8-4bb4-bf11-089141723357" } ] } @@ -1827,4 +1901,4 @@ "Formula": "项目信息!$B$33" } ] -}//GSOpJBzS3FJQwigKgYOGTdMRcPWcXTYNIJdbsdaGRrRN7ENirxMTchW6Aqw2vRFFuoejNu2iZomjWZgEGJBHVqSCJFTeHT0q7LWmTkV4OXKsCkVmL4riGj70Ebv4xKummdxPKXalNqwEmtV+kXWffSdBSdPOn9ARCLtvzeOXkhyyBeEoyVbi9E28JiIwouDVrdGr5byxvSRVhBg5CAQR5oeUvx2fI9I4pXUGPeUN4GsxvSD5+mG2rf08HiYpv9OXRItuLUaSz70OjWdNjWPQta8UA9TqxtB7NJNoZAP0lQpMF9mISFvYX/5PAq1zLW/uvkRTACCy1GJC+P7ONlPVA5BK101QLX0EJANwYxQZF6jbp8tuRXDoLXvjr2UGWVUC0aCUuKfKzUgA3qU13YdOMAlWJTbgP/3fv/OABOrW4JXq2rmH/rsMcdPItnXe0SmuBOdtYFy6EUX7ejxxNveiju8rDhJFTEHuMARXdmHxPqNixwVgO5NowtGCdsCjGwS9LYv0/UQVNI0SQOOVglAbXn4HNdFpBB6F0UaFm5RMzsTUaTZwNyfDi/5n04dgFjXf94PCrcIpPJe42rbVQxr8MY434wSNZRF3OVVT6fY0AnDYtcC4ukcoFl6ipsjlQnmJ242kRpw8Yi/rN8McGDzaWDih7Qiod3TGEMgrZF3OtfGzThJNgAlv5cci/+kMxBixz7rBcpKsvX5a80kCCV9lqt77GzLf2ZlWHjW34WuMLE0miTZeC3+VWHTArrcVsWSCxhI9ZArYLJouNt6N5kxVFy76ACYJIYFq7+ZDYccQtIrhD2cmzYNwzYtLn4I5YRZmtihZIguQ7OdKfKQBFg2eeKwQ7jdi04mtarpUYkUDKqDsXY0IhYJfeqF0qz5iMPMC5mEPtGvks1cRSVimFj/2xg==|920 \ No newline at end of file +}//vZ1RcUtE7caUm+bRbS54tmLvyaGzhQxulOBLhgXfKv+EDMy11cm/0UjtgbfpxSsuI/nFMf4zRvFpfoTgLhE7ucrbyd2XMZIv5q5gJFhvEpU8/TtOTx2Ue4kXQrJGhsChocGv0iQ1/uAYkrHNBdwo6bvedL3zMs0pt88Quc6ufp809hcPkopKOwfMkasOLZ3YvVkRl/Dx5k32hWlqvBk2yiOZxMOs8G29Ez8zy6rhuf0poSx8kqdM9HVwU5FMzXi5tiJu/Mir1rvDtdblcEd5oQgNXVDVtnko8AqG8PxMy7KtN1FRIhFmwT5di+2xE5divNuQY+rDWoy713bN5a71UQd2hb4Q/mjJW3DgVywPBV5CE4fyS3ptGWbJP5XvjyhK91sM7V9ZQ3de1Q4p0O5lXu8ffl7mwpzs9zGqhLb7+Z1Y6gBR67M6tSHXtGZEKmaSbmQruGGM/0BedZFGjCvXTe7VetY3iVnRT8znFsijUeM0ALjvkJyhncwfaZ8DNluyGtmb34zmukixfKyu9pB63D4cZKojCs5H2Eo0YQkz1WgfZoMRy212zjYdnNPYVKFd/K4NkLwJj6u/XLZNxIs0gk4i7LAIcLN9fDYF+Wut4pn3mxxFtQ7WLX9pAkRgscbnHJrhSm3eR/5aEPt4YjRmCcfAOkdTuXxUmu955sddtvgSri4GDO0FLeK3SZvd4QZrBK+RJSpQ3qM9M/Oj2xF1S6Gfw3QUUyO76vuD9Cinu/SZIZnOvaj9WIplVyIk7q6sByoHEWA0jLzIrvl09rPyc75PP9LhgOWfBONYLyDUoDXEqO14XhNNMb+VLtmOxKgAE1XozWYltWKr5zwSGKsrqDQb2yIKDA4yqm/b5nhkP6OXT/kJXcXjQh+Hkp4WySZS8/Sqw8/dO7pT+lo512ZLcA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目标题.json b/Pages/项目首页/项目标题.json index f5989352..98825232 100644 --- a/Pages/项目首页/项目标题.json +++ b/Pages/项目首页/项目标题.json @@ -401,7 +401,7 @@ ] } ], - "ID": "6af2c647-e867-4726-95f1-1970494bd23c" + "ID": "56e88d7a-8d92-40f2-a2ab-236b620a78bf" } ] } @@ -505,7 +505,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目标题!菜单回调" }, - "ID": "7b23b2d64ccf4c9ba4461d0f4923c63a" + "ID": "86586cd01c1049e38b937a09ba094830" }, { "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", @@ -545,7 +545,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "cb017514-838a-4711-88ca-c1cfec9bad87" + "ID": "407f8fd6-804b-4105-adbb-caab221b6fa9" }, { "Condition": { @@ -566,7 +566,7 @@ "PageName": "项目配置首页" } ], - "ID": "034515bf-4928-48c6-b5ff-b3c14f6690de" + "ID": "2b25fbc8-5401-412a-b34c-f83365dfdd85" }, { "Condition": { @@ -583,14 +583,33 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "DrawerDirection": 3, - "ShowDrawerHeader": true, - "PageName": "预算申请", - "LoadBindingDataOption": 1 + "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", + "ShareCommandContainerRefer": { + "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9" + }, + "Params": [ + { + "ParamReferObject": { + "ParamID": "30be91f8-0920-4879-bfdb-73a2443b9f1b", + "ShareCommandContainerReferObject": { + "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!项目ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + } } ], - "ID": "9fad376c-2ff9-411c-9647-28a4761b5fab" + "ID": "01e56348-c221-4ddd-81c4-4db3f8ca5e00" }, { "Condition": { @@ -615,7 +634,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "删除", - "GUID": "aa3df268-877b-48f9-95a6-a9df66d7279d" + "GUID": "ce76ded5-121c-47f3-9f26-867f46bab44c" }, "Value": "1" } @@ -626,17 +645,17 @@ "Message": "操作完成" } ], - "ID": "1755bbae-92ea-4e3d-8587-6fcd510fcb67" + "ID": "77705d8f-b798-42f6-aeee-66de2d9cb982" } ] } ], - "ID": "c4bb5acf-da46-4778-820d-9f17ad225124" + "ID": "e4791f1b-a8e7-43a9-b24c-34cb7a6fe705" } ] } ], - "ID": "d0940132-cf39-4e9f-ae21-138469848d41" + "ID": "e3cb5fbd-6733-4685-81cf-416cbd6c04f0" } ] } @@ -760,4 +779,4 @@ "Formula": "项目标题!$O$6" } ] -}//557c1qPl8zPLBvBRG7xR/nqeS55fYVQ16DV+rrAFyiwZA6gv9btlFNcYjV5PEVZbHwBYvFXUo4GLAZ7YFUzfsNQ8/q8dyLtkCfBWZXYephNdgYdFR8Yqda5J9bl4NcYExYIUMjT70mDZRkrjyaABfmZTs4vDlHB82PLRwgjFJvRtezTBEs24V99WM+YdSA9M4sJNq1paHoAhQF+lvti7M4sBN+jkvx3Sj2iX/ZItGgtL4tweTwQhkTjM8muQOSpPwxsyUKAAkIljxoJLFT+FQCk+hQlcLhA71ujDcwVA5idUlGZKJyaQBofUWjQaKcKpOjoTtxZYotzP4Py+MG9chGdLKcq29+yAdn1FjzY3Tk4VGn6wwmX+MGJt30TjLlZyrAAQJTdjfnW7QAN3V2NLOY9KhuEnf1t55CoQMqbwemkLuPZ1Y2KHG2OkUcQcDXF/bn11ZnXc+9glAmP2Nf0wyP3a9Na29Qwv5crl5T72CWzvL3zcbIAUHlncmPJL2tFp1QigFkAYOelU/mrvFCd43pRLMnnQGpjKtFRtTP4gCHEFzM6JTxb6TBnerVa4mDsQnsi8UsfXQ55rmS9gA5BCBxtl81aQB0gS9GEVU19oLDaIDw23Wg19cDHK2iL0e/tM9iTl65Sfe6WbOTnufoop450ssMT/xQ5xKYZnF8KZuSLlMSAM/+oDs9g5KeKMIuf3NJJjezK3+AbfyoATV/QTkzgN51KWS0ZLMyRCrlA45OQvMAgOVNIlY1OrQcWobFZtx+IbXotjrKa3UuaB5oLh6iDg6+X1/XgBwKJ7pjdMZ0xfC45iKqOZzlXJI4G5u/dGYFkFuA4Xzp92Rk3xLCwehOKkfahWDU6AnDeaz7miHetc292MAmCiMiS1Cc7ap0j20ueHoxt4uUa1mcm++EpAOA==|920 \ No newline at end of file +}//l+YrexHpHdUII38EIU4dULjJ/yAwD8s7OteuvYYxMpEnndsPmnAvlMR9hYyAsrV+z77+E2slou+jyxfWQRRyw873yQinMyaaUgEa+xavbmlW8aepty7P/4DMl5hx0HSRxaHsNz42QN3Y+oy+1YdCgaw3kgQ6I7zMN6oiVeYzb3SCVoWWj3km8DG0iOSDYWHw2eqqOw1cNFvDK0nI3GiWUygfv+XzZfc+nb/lylMd21sMLGevMGpiw93otmMS09LcPuqY/3LxTE7T7HGsmlr5BKgqTBknU8lUHZ4N7gBZXMSuGn6GYlKY657dlHoIth3EGXeiKmd6DisrNfXmch0ZijF+Nbb5aeaM/cFLt58/FdlSCT2ElqAwHBtbxOQlTPRSAIjoi0OpoxO8MjuVh+IRb76hRF+Hl2uDB7SiZ9stA9Zko0MTnbOyPeahAlercOYJM9jrGt58Hee/0o4mU1SD3DsS0zW9MrkTv2o+6nifpn4V6KnY8QVcjVUbFp8ynejXLQTQSmKLyES+Ujxn1oLXbiH4JjxUk6I4uLMb6VXDJylruYPjZlAlcAfGMDs95NsoOF8eVvygy9HVSYvUjKDozdGzmIzY0v6iB4FuZjAl618xmEBIWO2q4DV41sOlIIqeY16zPVIqB+17aEPs0UtOuMCoXkpmi+Lfl0cYR9kNVwdXiO9LUJwUqgt0+4avnveaquejUGBFc3WUn8gCzUyYV8cYWhgG5bHh0JE3bJWr4gAvHBSFkwT+h1a4BNOGOP8EtmvbM+h1JuV068QiEKXQwympnRc/H+hhBjr5yE15EefrqMRxGmvmMhhMb43xB/DzsqdMTAxoMnRoFPV5iBwz6HoOQZCKTkOG09uvhWuVzvxvPS0ziTu36pMQt9xNRPJhEDO2SEdnXP+aKpxelhyZlg==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目概况.json b/Pages/项目首页/项目首页子页面/项目概况.json index 5dd31a38..7214e78a 100644 --- a/Pages/项目首页/项目首页子页面/项目概况.json +++ b/Pages/项目首页/项目首页子页面/项目概况.json @@ -298,8 +298,8 @@ { "BindingInfo": { "TableName": "项目动态", - "ColumnName": "FGC_CreateDate", - "GUID": "6d9d0eee-5703-4e14-b438-a21e533e487a" + "ColumnName": "FGC_LastModifyDate", + "GUID": "b20c9e30-f15d-414b-a28c-34d35f1c5d07" }, "ColumnName": "timestamp" } @@ -675,14 +675,7 @@ "Orientation": 1, "Items": [ 0.0, - 5.0, - 10.0, - 15.0, - 20.0, - 25.0, - 30.0, - 35.0, - 40.0 + "NaN" ], "DisplayUnit": 1.0, "MajorTickPosition": 0, @@ -723,16 +716,16 @@ { "ChartType": 29, "Values": [ - 23.0, - 23.0, - 23.0, - 23.0, - 23.0, - 12.0, - 12.0, - 12.0, - 12.0, - 12.0 + 29.0, + 29.0, + 29.0, + 29.0, + 29.0, + 18.0, + 18.0, + 18.0, + 18.0, + 18.0 ], "Name": "计划工时", "MarkerSize": "7,7", @@ -747,9 +740,9 @@ { "ChartType": 29, "Values": [ - 10.2, - 10.2, - 10.2, + 15.6, + 15.6, + 15.399999999999999, 7.2, 7.2, 1.2, @@ -808,4 +801,4 @@ "Formula": "项目概况!$AG$2" } ] -}//LYEQzA/Fz/rnXvIRWUy14WBnTS0tQBwMwLuqViGDHG4MngnBJCaUOSgSFx6BXreDr9lMFwq159GDPbiv31/aRnYoxDA/n9X1+ereZp7esgShOY46/libNmBLYKneOsUVll8WRBGk7BUvF/P0RsqpK7S7UbWBtlHdolwDyXl93a6S3B9RyHh9kWFlavTeQO/cLx2971ViNw/+tEY81PVu9SKH6BccthrS9p+3pJwqXEQGOmngmH6mw+UGDq3n2+NydAgDNgYRIuWYDzN/0pNrtim92jUoaoKgIZ7yn69Ehn44G1p2QR+jE6NDV26FZsq6PMQzRl8DeQueSaN2hSQF9xNRwzETxtLo1XvPnEVbYmskG+baKDbgSZIi/zRdaWQ1sKKVIhpuPb4LDbJaHPU1xqPa1ZRZDisjb1WOrU+N0SgpEmC2ZDRe94E/XYq9R4cq6sdxhIIC7IRfT1ScY/Db+ongMc+3u4MgQTdP26vNr9DECpwQYJ78Z/81hSza83WBHuVN/ss1rnFcf5jXu1poMF4M6KSlzFjk3OldYc6xzTqsW4sLUoMvaiSn9tXgazov5zRoO2JIog3TFJBpWH6KGIGZH+uzmuzpjEGw9bo5I1LhC2LKrXMGanymixwpZokIjdxmqJd6yimDF3ppi4evTTdq/ifn+lEqnfUQ+wONubSEF09QvPHZEMjjTDPZzRtAW5+YT3kN7J/MIKNMnT7XrIqOlNsDMebg8OeJ8wt+q7yU0o9ConxB1+flrAKTffuchdJ5T+Ou61u9ls/6O+ADJ/JJSeCDSTUOxkrs1X8W3T3pjDuuCjuq1KKx6cSSBvb1NNYV/wIz/zIiLH0sAnnrWhcIiDcIFO9l0UhST0I1dAwU66VuMnFkDi3l31aLsFAMpJZpk6KdUDFftmW3tENoAA==|920 \ No newline at end of file +}//2/XNxl+qbLlvwEU6alMGY50ParIOauAB4s4gH9x5huEz3qAcR5gidshPkHKLiCPajaiwhkuJsWcOt5OG6CHiW3DNWudQ83tKMlB5654vNQa7WCLT19NBvR8igI2NPo2LUsaf41jEiaXdWnBbgyg0/X3LrcecmORovDyUImF5Qa+C0E8HuMyTA7f3q7Lw1c8fxhpg8Vat2bzDwo9aTUI41OTGePXACI26DYPcQyj4Wzg0js3FP6L07bOwtCy2tR7Qb2cwO7jx+qwAn3obLaN5sD5N+cq5KJA/Za5F67nqeU5EMLGeZy+vheQFQxA6neBbbKgOR0cC8juTe47oOLiXlfQM3y9WvQrZBzozdgY444qgL52Rlyg7NDJ9Egi4GpBddjVW0VVCVg1UT07YrluZrj6omA/1Jlr/+wP3yFb0ps0BWgubp/XSIwa1AYAbQjV0mGgdloKvqtCkYXwXwPRn3N+kvljJS5rPA5/o2SNGIK/pxV5lHa42a5ChZOv6SQKMZdHTbMVRZBZl7W5mey7jSo7HapZyile7EyHHDhbO/80ytKOldmd46ui3OGpkt3dqmZaH5NjbtO+ekyMWrGdq8JCNzhRlWneCQBAUqc/lF2wZ2bW3Udy9+j1OhKnV8JiJw7e3BAMv5JaROpV3MRw5TwApktJ+hmtWF4omRHV4gtnaKF1l3FNu5xzjRx1oU9oG5tWMRKJQE5jW+grRVAFGP0VQQbCkZY1EhWf6+E7DIPSKvU+mvWU/a9tjncNNs7E+PF4VrDGRR5jdxN8xdMkrx3A8hRJ2DGcDv9gtWqaVYwWQmwme5UchgnTfAAbIUg1PSHe2fHSTHhPw50EAD5oxo8sy1v4H8I31qPX+IxWjmJYBEK8nvTZxSJ3CD+Rh/MjcOImOTDrDsXpBgJua26yUMQ==|920 \ No newline at end of file diff --git a/Pages/项目首页/预算申请/预算申请.json b/Pages/项目首页/预算申请/预算申请.json index 20263be3..99474e0a 100644 --- a/Pages/项目首页/预算申请/预算申请.json +++ b/Pages/项目首页/预算申请/预算申请.json @@ -21,6 +21,11 @@ "DesignLengthInPixel": 32.0 } }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0 @@ -61,6 +66,11 @@ "DesignLengthInPixel": 24.0 } }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 71.0 + } + }, "18": { "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0, @@ -74,25 +84,21 @@ }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 35.0, + "IsHidden": true } }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 71.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, + "InLogicalVisibleIndexes": [ + 20, + 21 + ], "Count": 22, "DefaultSize": 35.0 }, @@ -171,23 +177,92 @@ "1,1": "申请项目", "1,19": "申请历史", "4,1": "申请人", - "7,1": "原预算工时", - "7,9": "原预算费用", + "5,1": "%CurrentUser.UserName%", + "7,1": "现预算工时", + "7,9": "现预算费用", + "8,1": 0, + "8,9": 0, "10,1": "申请增补工时", "13,1": "申请增补预算", - "16,1": "申请理由", - "20,1": "取消", - "20,13": "提交申请" + "16,1": "申请理由" }, "AttachInfos": { "2,1": { "BindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "125dff95-9fdf-46e0-b011-417d31011fdf" + "TableName": "项目预算变动表", + "ColumnName": "项目ID", + "GUID": "6abd8cbd-e759-43be-a89e-009ab14e3924" }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目", + "TableValue": { + "TableName": "项目表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目预算工时", + "GUID": "7e56e36f-4596-4151-a148-a9337e0c229e" + }, + "ColumnName": "项目预算工时" + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目预算费用", + "GUID": "fc29872b-0e8f-44a0-a0d4-0543940f07d0" + }, + "ColumnName": "项目预算费用" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "7c41fd84-5fee-4fcd-ae09-bd42b26ee9fa" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算申请!B3" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "5e40d79f1eaf4bac926b2fc92b50c797" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算申请!B9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算申请!项目.项目预算工时" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算申请!J9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算申请!项目.项目预算费用" + } + } + ] + } + ], "UIPermissions": [ { "Scope": 2, @@ -255,6 +330,9 @@ "loadingText": "加载中" }, "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false } }, "2,19": { @@ -329,9 +407,9 @@ }, "5,1": { "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目经理", - "GUID": "bb7f3840-4d94-4f72-8e61-02e8e0ea93ea" + "TableName": "项目预算变动表", + "ColumnName": "申请人", + "GUID": "4c945f6a-7457-4561-aa2c-c0909c2ebcfe" }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", @@ -350,6 +428,7 @@ ] } ], + "DefaultValue": "%CurrentUser.UserName%", "useBinding": true, "options": [ { @@ -403,23 +482,31 @@ "loadingText": "加载中" }, "noMatchText": "无匹配数据" + }, + "DataValidationInfo": { + "IgnoreBlank": false } }, "8,1": { "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目预算工时", - "GUID": "8d63ab9f-dc78-45bd-935b-fe8949b56caf" + "TableName": "项目预算变动表", + "ColumnName": "原预算工时", + "GUID": "5657b97d-0458-4d9e-b431-b807f40a469c" } }, "8,9": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "原预算费用", - "GUID": "33a4d0df-aeed-4ed2-ba5f-92ae89ef46ab" + "GUID": "25f5c718-b15b-48b3-bd3b-70429cd0181e" } }, "11,1": { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "增加工时", + "GUID": "02056cce-08ef-4a48-91de-a6fc3fce7b9b" + }, "CellType": { "$type": "ElementUI.InputNumberCellType, ElementUI", "CommandList": [], @@ -443,12 +530,21 @@ "controlsPosition": true }, "DataValidationInfo": { - "NumberType": 1, + "NumberType": 7, "CompareParamType": 4, - "FirstParamValue": "0" + "FirstParamValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=OR(预算申请!B12>0,预算申请!B15>0)" + }, + "ErrorMessage": "申请增补工时和增补预算必须填写一项" } }, "14,1": { + "BindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "增加费用", + "GUID": "a0ce30a0-4841-4e05-a379-5df69b343be5" + }, "CellType": { "$type": "ElementUI.InputNumberCellType, ElementUI", "CommandList": [], @@ -472,16 +568,20 @@ "controlsPosition": true }, "DataValidationInfo": { - "NumberType": 1, + "NumberType": 7, "CompareParamType": 4, - "FirstParamValue": "0" + "FirstParamValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=OR(预算申请!B12>0,预算申请!B15>0)" + }, + "ErrorMessage": "申请增补工时和增补预算必须填写一项" } }, "17,1": { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "申请理由", - "GUID": "16fef3cf-bde9-49e6-85c9-59bef4c882db" + "GUID": "28bc089e-af70-4153-962b-c7cc115b6301" }, "CellType": { "$type": "ElementUI.InputCellType, ElementUI", @@ -513,136 +613,6 @@ "DataValidationInfo": { "IgnoreBlank": false } - }, - "20,1": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" - } - ], - "Text": "取消", - "TemplateKey": "_RS_Information3" - } - }, - "20,13": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "加载中", - "VBalidate": true - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "新增项目工时增补", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "项目ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!B3" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "增补时长", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!B12" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "增补费用", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!B15" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "申请人", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!B6" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "理由", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!B18" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" - }, - { - "$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.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true - } - ], - "ID": "74184361-980b-4a69-9e85-89108e8d1f7b" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=预算申请!msg" - }, - "BtnText": "知道了" - } - ], - "ID": "8e7a5c40-c6ab-4535-8411-53d7f569a68e" - } - ] - } - ], - "Text": "提交申请", - "TemplateKey": "_RS_Main1" - } } }, "StyleDatas": { @@ -676,12 +646,14 @@ { "FontFamily": 2, "FontSize": 13.333333333333332, - "Formatter": 4 + "Formatter": 4, + "HorizontalAlignment": 5 }, { "FontFamily": 2, "FontSize": 13.333333333333332, - "Formatter": 5 + "Formatter": 6, + "HorizontalAlignment": 5 } ], "Types": { @@ -691,6 +663,7 @@ "Body", "[AUTO]General", "0\"小时\"", + "Left", "¥#,##0_);[Red](¥#,##0)" ], "Borders": [ @@ -853,21 +826,6 @@ "13,17": 3, "13,18": 1, "14,1": 3, - "14,2": 3, - "14,3": 3, - "14,4": 3, - "14,5": 3, - "14,6": 3, - "14,7": 3, - "14,8": 3, - "14,9": 3, - "14,10": 3, - "14,11": 3, - "14,12": 3, - "14,13": 3, - "14,14": 3, - "14,15": 3, - "14,16": 3, "14,17": 3, "14,18": 1, "15,1": 3, @@ -920,19 +878,34 @@ } }, "Spans": [ - "20,13,1,4", - "20,1,1,4", "2,19,19,1", "2,1,1,16", - "5,1,1,16", "11,1,1,16", + "14,1,1,16", "17,1,2,16", - "8,1,1,8", + "5,1,1,16", "8,9,1,8", - "14,1,1,16" + "8,1,1,8" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=预算申请!项目ID" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(预算申请!传参1,\"\")" + } + } + ] + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -954,5 +927,11 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - } -}//MWfEe0pdQzxIVl0DU7gbKoMX2ErmV4eE99ZDoHKnLMER1f5jujepPOahoLpKJbXB4vutDepGPBsWWo5hIklQPo1FGf61v+gjJepEFu+HBVzPvivxLnGIUIwjdNew6t1P9nrCJjsW9MRGbPez3E6pbo5NmD7ZdxpljhUtfcY+e30x5LI9sMZb04arCjEUQWXGGp0yaEH3D6m6yjH/UvvRRRZ3Jt7kfc4gyr9MgRxs7X9q/+Veoj3O9hIfDMYOMXkyu5gk2DZbzbi7yNYLU5iNsK66xpucFLVVnqdf8ssT1Fj4HEguSE7DBQQ1dCAjMqYJmKfmyYmGHmAShyuzhM13+J317J3IE49EMuxV7Feqjv2p8hi55O/HZbKHndrtLEwANLFSw3TTT1t7wi2s3Lr3BxeNDfn63awrL0msAO87+d/FvByFcH0dYo4KzfZeT9byc0AkdK2+Y5uvXLCSPvpEdfZb0pa5YVgZIknHqUmEnuMl+GSBGkjILryzFg33s9Hsc8zU8mMNo/3ZcUnyocho5wDqf3NAo5vO8rAto9dPQfN+yIqH1gbuwDO0JkQxOh6FnQLRGPAlLqg6oDfW3LSGVhxGBl6BO5BDk8pclj7KfZeDnxflvl6Q5600+EnkDESaUWaF+PzN7w+6bL9/mvq1V02lC7Sz/xst4fqg+ddBaScVr5OCwAqKVq+8wfKsCLU/NbZezDtOdQl7ciibY/k0r6CZoijpXehoqo+UZIEMFe7q5/LFwdM4ZZ3jhglZW3Xb7Xr2nWHtJOkaZAORve7QDKR2+Sxqeq3RR7Fwf7fHjw+Ffg8uv7eU8N3ap7sxXn9nKWnymx7yxxlsn5ESNTS3PNaaL7F5c859yuFPSbEvz9WZeZ/egExs8zIscRBq9nJPclnCeGhiJONVgrAN8FTA2A==|920 \ No newline at end of file + }, + "CustomNames": [ + { + "Name": "项目ID", + "Formula": "预算申请!$B$3" + } + ] +}//6dOYconz6rQsaYEyiClV7/hS4ubTX1VE3V6qB857smu6CyFsopagttGqV/rW7nZl3khPnu34CseGGf9XKd568vY+hsRaWVzlZk37lZuWQRSCMDQTvStOYlF4HYy0qDhyvJ6U+MJC1pkx3lWkGfOvRxEMypNaC4qyDC8NRWb7r10qZkEJ9s/LU7DjyN1m5fQFFSIVIS9TzdJTV0TXEtphvStGLE+wFFXsMY3oq88onPW9wm4xQAnUnaRwJPPuVsXPTANLnSOfagUN+p9S80vFPiLOZ0QUC9T2BQzeF9qEgf/Rf1kdNEf7oCAAEVchswBNF+NwTKvteBFxGfhRt1iF5fz48BKtHuBlYCk9dsnoWAZs3MqS0LQVDrBhgw/R7MzQ+Z91eoolgP9edBPZ2iK+xsAOfT7OrajpUhcuqkQhgX5rblJilMKemjmA6s3H2BUcsEd/BZFwXSHEfnEQXR9rebxNoXLgEGvIFBEB6PXJ9BbEHFbJoCdalwNs/FhYTDrTPcs8i9Pm9Ca/Bw2OwIiq8w7YppjuArPuEqP8myjjZTjQ5GeT902kytPjO1VxOx+nnXHvHdIeulF6qR8ycG7lTtAaPd2NiEXguuSyl/S14Xfa8kx3nb88WdElLW8Iv+h3ng4wPKzDo2drWA/o2hbeqeLRJLuUeT25Q1gaX/HXEOiGUkffvvwSj1Nue6pbOqT2wFyZfry2Ue2eOlvH/ADlcZuLOvbC4/L/Rrulgs5fSDrZT01OqX6vyIzWFaaqwAvkpT9brsNzLATeNWnQKcziiSunxSXr3n3kBWC1naRIhNkg2oi4N/FGlGq5xozjYPlJv7M5DkkKl6EQDNt7cV17vNyiP2Y61gRgA1+F7yUF8SxYH0ijLeHsB6I7xBGCJpB4R0FtQZhmRHW+R6R+v1wg+A==|920 \ No newline at end of file diff --git a/Pages/项目首页/预算申请/预算申请审批.json b/Pages/项目首页/预算申请/预算申请审批.json index 7f984112..08b4a834 100644 --- a/Pages/项目首页/预算申请/预算申请审批.json +++ b/Pages/项目首页/预算申请/预算申请审批.json @@ -225,13 +225,13 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "原预算工时", - "GUID": "2baf1442-6381-48f2-a5df-46ac4bb8cd29" + "GUID": "3f2b409d-8e56-4268-8f6b-f63e74655eec" } }, "6,7": { "BindingInfo": { "TableName": "项目预算变动表", - "ColumnName": "增加预算工时", + "ColumnName": "增加工时", "GUID": "5f8bff8d-6e4d-45b3-8228-49e50f2ecad1" } }, @@ -246,7 +246,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "原预算费用", - "GUID": "0a35797b-fd07-410c-beae-174f0f034377" + "GUID": "0c2a9de1-3199-4abb-a77b-55298673d38f" } }, "8,7": { @@ -566,7 +566,6 @@ "5,16": 8, "6,0": 2, "6,3": 9, - "6,5": 2, "6,6": 10, "6,7": 11, "6,9": 2, @@ -714,7 +713,6 @@ }, "Spans": [ "17,1,1,5", - "6,3,1,3", "5,3,1,3", "6,7,1,3", "5,7,1,3", @@ -723,10 +721,11 @@ "2,13,1,4", "1,13,1,4", "14,2,1,14", - "8,3,1,3", "8,7,1,3", "8,11,1,3", - "6,11,1,3" + "6,11,1,3", + "6,3,1,3", + "8,3,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -789,4 +788,4 @@ "Formula": "预算申请审批!$B$18" } ] -}//m7dseABXF/nf6N2SV+KyZSHYrJYYMmxpbBfUBQB6V1bEFhQkYRUGKaD7PXfuiPQ+MPhqNbme+4Y0p74Ihe61dsCQIy8VImC+LM06fCJCZ7/4Jgh8peOIfVFzb0qAJPrbn/1gkWhodhxCIo2uSgIfiOahUsvqcLHQLngDsDpVxofpHN3rgAhrXLZGCaNvTQTeo76kANI0ovp7NFUYPSIiGMq9/a6tmUYt5y+4iOeij5G7DJNh1z2Yb9a0LyvKNyYAWWDFpMpo3Z2e13ABOTeLNBtcPa8fTtpnOd6bjNCkyi0Kq4hJQtjsg5l+c01+4EBCvJlMCUyJd0HfDLrp+sKOPFEFsvv2qHviH7t5KIeTTVxNUt1rVpQiJDXhQFZj8uMmus5MU/BClNH1I56qLjqC0ZU/aFw760lyyEyB1ZvBbutXg4cDYtxyW8+m6fseT87MGZs+2W9XPXsA8cDoJ8gJpVXDKLL4YsRJt1lgJUqvVwLBF2Nukw0/bCJHPBSpUTvmLyRHu+C3qQGvT/DxQuSIFcnIG9rOcBpSM9R+XxdsE59AO9i0spfr0y1dU8vsCkO9rgbyKwyZOR/eAjTSvwdvFZgUDe/V0vHkZ6otz3yMfD31dWJeE2Geib5SqxqqY4Af5PXj2+z6Kui9azGRUXKhdT+CPjhvlg4NvoqW97DmIk6kLcvMOza8E/d7buQQ4cxlYXJaeWbjveSXNPnMeDCcJxgTvZM20Szsv+zJdBB0/k/RV+aLavxNHxwg3mefO74WTL7PCHlG0K5aRmWwhPPHmPazKGODN+xncQKrY4Af+q80yVFTYGdPui3rTjByJnxxib4ikYggw64AUJ+P/nhghkb9P0CR1KcDp3AFTB423T6RLE1q6DbJJvvBpyR67cHdhtpb2EDMIMX4Gtoz8vQSEw==|920 \ No newline at end of file +}//BnCdMOO6PQ26vTPMFu9/t47nCBz0N30MMAsxAp04lDj4MAfOmTNCzGpuSmpyH8P8EdprpScQj/eQ2pt2un7mIUSM64mho7Mr9Ruq/ULh32b8NmNmTrVkE343HcnyzwXEUpCFv9XJICf5llSfOtTigIcBlNkzOe6p+Ha9VkeyC98TvSr1vC/BiEye7G9ALKEXENHl2+N24K6Z7EZobTZZ5iEsbm5Fx3B7kL7NIaD37cB3ux6lhP66IXPOCozlK2Rx27HUSUhFvn03jc2YUp2vVj/H7+CV0vV8yk1PCikqif7xzu5nyMPjg9kwH2LeEGq1uZLK5ZQn+XgeS24khtKw55UxSUU8kExQGeNNJjKqhdrxd1HwIbrkzcuy5av60JSuPPFcshoN3HXz0a/zANOcdumI8hGOYCC0R1gqVJZGB2oJQx7qFeFt//A9pymAvOD7CBzRMBck2wVW3lxPG3oeTxiImXPYiC5VR3cl/F9xQQeFM5zzOYpIstsRYJGTrzYuzaTgaKIxYvOeXet6XoHNfVSjxyYnAyRuU8LEVNT22Co48UNY1OwKtgWGkIhdVE+TnYbCPZ/AIpuHsyuwYl4L1z3O2HAPuGDCIGccXGHqo2GsY29SvGGaRtvRv3vCTMeiS9z31UlNM60HWJszoVE/a7hJKZcCHsQ/7+qh1OxQ6CBwJkI9OVCTp7FoKhuhsmztwcMsSn1oxMMIwRznCY/pouTXYozEkeaY2mUjUBasRzzhXcezBKFTxqRG9i4oQatUXrGfTJ8HhuWK8Hg32HcXP7cxq1huWFbXRHdTJXPmGhi6wYCHo/UZ6tHVr3phY5iQW/QpB9yZKnYvv5bRa9nZ44NGNOu8MKLFc2nKniQBbTa4enjrpe+Cft/Jcc/N+mQy+riN34mXwrhWI2PLl9+84Q==|920 \ No newline at end of file diff --git a/Process/预算申请.bpmn b/Process/预算申请.bpmn index ad7ae4af..0b34bfb9 100644 --- a/Process/预算申请.bpmn +++ b/Process/预算申请.bpmn @@ -1,69 +1,87 @@ - - - - - + + + + - + - + Flow_1y1g7g4 - + - Flow_1y1g7g4 - _8c854f9d-40d8-4aed-acb1-6778e09b2e08 - - ${nrOfCompletedInstances > 0} - + Flow_1mecf6x + Flow_10prhsv + ${nrOfCompletedInstances > 0} - + - _8c854f9d-40d8-4aed-acb1-6778e09b2e08 + Flow_10prhsv - + - + - + - + + + Flow_1y1g7g4 + Flow_1mecf6x + ${nrOfCompletedInstances > 0} + + + + + + + + + - - - + + + - - - + + + + + + + - + - + - + - + - + + + + + \ No newline at end of file diff --git a/Process/预算申请.json b/Process/预算申请.json index 19e1480b..d3c600f9 100644 --- a/Process/预算申请.json +++ b/Process/预算申请.json @@ -26,5 +26,6 @@ ] } ] - } + }, + "Weight": 2 } \ No newline at end of file diff --git a/ServerCommands/项目/应用项目增补工时.json b/ServerCommands/项目/批准项目预算申请.json similarity index 73% rename from ServerCommands/项目/应用项目增补工时.json rename to ServerCommands/项目/批准项目预算申请.json index a047fb0b..22229223 100644 --- a/ServerCommands/项目/应用项目增补工时.json +++ b/ServerCommands/项目/批准项目预算申请.json @@ -1,5 +1,5 @@ { - "Name": "应用项目增补工时", + "Name": "批准项目预算申请", "Enabled": true, "Triggers": [ { @@ -25,9 +25,16 @@ "Name": "申请ID", "DataValidationInfo": { "IgnoreBlank": false - } + }, + "TestData": "11" + }, + { + "Name": "状态" } - ] + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } } ], "Commands": [ @@ -42,7 +49,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "项目ID", - "GUID": "5da894c4-c883-486e-8932-c3c232ec7e18" + "GUID": "6e064348-1eeb-44d5-bb4b-c785edf11fbe" }, "ColumnName": "项目ID" }, @@ -50,7 +57,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "项目ID", - "GUID": "5cb5b717-15d5-49d9-a6df-f54bd8b144a8", + "GUID": "3ee07a7f-1678-418e-b6f6-45d32d361cfe", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -63,7 +70,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "申请人", - "GUID": "214bd775-5f76-4f6b-93be-c05d4c0246e2", + "GUID": "7774924c-568e-41ce-83d6-1d15bf5bfc1e", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 1 @@ -75,15 +82,15 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "原预算工时", - "GUID": "21b15405-6ee0-4905-8d37-e92aec036a64" + "GUID": "2f829421-650a-4afe-8f4a-47b072ff34f7" }, "ColumnName": "原预算工时" }, { "BindingInfo": { "TableName": "项目预算变动表", - "ColumnName": "增加预算工时", - "GUID": "7e71029d-77fd-4969-8397-8ac1844c4c6b" + "ColumnName": "增加工时", + "GUID": "d20c2435-1bd6-4000-b0d3-9574c1819b51" }, "ColumnName": "增加预算工时" }, @@ -91,7 +98,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "原预算费用", - "GUID": "ad26dbf9-b1c7-4e05-beea-bf9f871cddad" + "GUID": "04939afc-0fb3-47d6-88df-a243fdc0f528" }, "ColumnName": "原预算费用" }, @@ -99,7 +106,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "增加费用", - "GUID": "61bf736b-f9c7-4c73-89d4-181e0b254c7f" + "GUID": "4cf8d69f-4405-44e8-a69e-fcdeb3fe7053" }, "ColumnName": "增加费用" }, @@ -107,7 +114,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "状态", - "GUID": "233c2f41-7339-4ddc-ba7b-e5215c97c59b" + "GUID": "4b70f5b6-af53-497f-aad0-5adf92c56673" }, "ColumnName": "状态" }, @@ -115,7 +122,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "流程实例ID", - "GUID": "0030d8d0-781f-49a1-9423-2f90d99bbb45" + "GUID": "203c38c2-b306-491b-a4e7-ed08e847fdfc" }, "ColumnName": "流程实例ID" }, @@ -123,7 +130,7 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "流程实例ID", - "GUID": "18bf2fdf-676b-4461-acb8-a41a8da4ef8d", + "GUID": "42853655-988e-466e-a0b6-ef948827222a", "RelationBinding": { "RelatedTable": "ACT_HI_PROCINST_View", "RelatedColumn": "ID_", @@ -138,7 +145,7 @@ "ColumnBindingInfo": { "TableName": "项目预算变动表", "ColumnName": "ID", - "GUID": "3d56db16-5b99-4702-8cd1-b3fcc54d6d1b" + "GUID": "b82bc3f0-00a9-4863-8294-4868aee0e3e5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -147,7 +154,7 @@ }, "TopCount": "1" }, - "ID": "3f8a6ff80e494e6f8638269f2da384ad" + "ID": "679cb7d5a3b442379a2ebe94bfe9523d" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -173,11 +180,19 @@ "TableName": "ACT_HI_COMMENT_View", "TableValueType": 1, "BindingInfos": [ + { + "BindingInfo": { + "TableName": "ACT_HI_COMMENT_View", + "ColumnName": "USER_ID_", + "GUID": "d47fd7fa-5d2c-4b61-936b-064a69f72834" + }, + "ColumnName": "审批人" + }, { "BindingInfo": { "TableName": "ACT_HI_COMMENT_View", "ColumnName": "MESSAGE_", - "GUID": "5a67d3c2-151d-42cb-8779-e7582043fa20" + "GUID": "fc404b40-f47f-45f7-af6f-e0d90ca2c0cd" }, "ColumnName": "备注" } @@ -190,7 +205,7 @@ "ColumnBindingInfo": { "TableName": "ACT_HI_COMMENT_View", "ColumnName": "PROC_INST_ID_", - "GUID": "ac5c1bf7-df32-41fd-994e-496ec9d7d77d" + "GUID": "f848ef49-a9d9-43de-83d9-89a736cc29a9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -205,7 +220,7 @@ "ColumnBindingInfo": { "TableName": "ACT_HI_COMMENT_View", "ColumnName": "ACTION_", - "GUID": "299ba4e6-9bb1-46c3-9b19-f1f42eb0c4dd" + "GUID": "447d54ce-e9d4-45ec-b61f-f69ef1e3277f" }, "Value": "拒绝", "LeftBracket": 1 @@ -215,7 +230,7 @@ "ColumnBindingInfo": { "TableName": "ACT_HI_COMMENT_View", "ColumnName": "ACTION_", - "GUID": "75857f2e-4e45-470c-819e-e4000608a84e" + "GUID": "652385b1-e3f1-4bbf-b414-a17af8ed839e" }, "Value": "同意", "RightBracket": 1 @@ -232,14 +247,14 @@ "ColumnBindingInfo": { "TableName": "ACT_HI_COMMENT_View", "ColumnName": "TIME_", - "GUID": "0ed02494-6bb3-4c15-97a7-5d62d8756eb6" + "GUID": "ae8aaba3-7023-4540-9e59-8ae8a266df29" }, "Order": 1 } ] } }, - "ID": "2a2d252247be4f2c9f29394e0483d065" + "ID": "1390cfffc2804899b260900fff1ca732" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -255,7 +270,7 @@ "ColumnBindingInfo": { "TableName": "项目预算变动表", "ColumnName": "ID", - "GUID": "e86f50d7-8217-4fc6-8776-b97a79eab9f8" + "GUID": "1ad1063b-7d9d-43b5-bb3a-0f08debf60e3" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -267,18 +282,18 @@ "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "状态", - "GUID": "b798f803-4150-4646-982a-2684760de783" + "GUID": "22e1a131-ae3d-4c40-8ba8-5e61b1fac69c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=申请表.结束原因" + "SerializeProperty": "=状态" } }, { "BindingInfo": { "TableName": "项目预算变动表", "ColumnName": "审批信息", - "GUID": "1e97d34c-e4bf-44fa-869d-68d0ea0a5942" + "GUID": "ba9d4ddc-4dac-4bee-933d-c75cc1b21dec" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -314,7 +329,7 @@ "ColumnBindingInfo": { "TableName": "项目表", "ColumnName": "ID", - "GUID": "4d24b55f-714e-4669-b5cd-93f37095523c" + "GUID": "254ec264-9054-48e7-ae8b-3498bb05955a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -326,7 +341,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目预算工时", - "GUID": "6439bc2c-dc5f-4101-b7a7-05775feb39d0" + "GUID": "1717fdeb-ae7e-4228-a61c-f86179632c98" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -337,7 +352,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目预算费用", - "GUID": "2c14f476-1f59-4d9f-86b7-f644e48adbae" + "GUID": "845cb912-a246-4ef1-82db-fc09131955d2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -356,7 +371,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "ee0d1050-03a7-4b89-ba36-81012da5fc88" + "GUID": "b39e4031-dd55-4dca-a58a-2f6976a5fb92" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -367,25 +382,74 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "8f4036f5-847d-47f4-bc9e-6d8891192793" + "GUID": "68534133-0480-4dc6-a60f-aeace160b2fb" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=申请表.申请人&\"申请增补了\"&申请表.增加预算工时&\"个工时预算\"" + "SerializeProperty": "=申请表.申请人&\"申请的项目增补项目预算已通过，共增加\"&申请表.增加预算工时&\"小时、\"&申请表.增加费用&\"元预算\"" } }, { "BindingInfo": { "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "b78983ed-9348-436f-88ba-1f80ba1a5f50" + "GUID": "b20267d5-c3f0-49e3-b153-3c6291422a62" }, - "Value": "%CurrentUser%" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=审批历史.审批人" + } } ] } ], - "ID": "4e7e3aa4-4acf-4c9b-8be1-ed0dca3092fb" + "ID": "4162c508-2474-4077-8358-c88051f0733e" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目动态", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目ID", + "GUID": "2d659bf5-e136-4647-bc98-3064b251dd44" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=申请表.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "项目动态", + "GUID": "6e34a0a8-8846-4504-96cc-9339d829bea5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=申请表.申请人&\"提交的预算增补申请被拒绝：\"&申请表.结束原因" + } + }, + { + "BindingInfo": { + "TableName": "项目动态", + "ColumnName": "执行人", + "GUID": "f755a804-f7ef-4547-a095-6508ca514835" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=审批历史.审批人" + } + } + ] + } + ], + "ID": "dc132149-9674-46a5-b8dc-fbc192a5ebf0" } ] } @@ -397,7 +461,7 @@ "Message": "应用成功" } ], - "ID": "c4b363ca-3080-443e-8a5c-51d5774b8de5" + "ID": "c83854cd-235b-4e28-9d59-54197de71200" }, { "CommandList": [ @@ -407,7 +471,7 @@ "Message": "找不到该申请记录" } ], - "ID": "70a53f04-ebfb-4ea6-8a25-ad3570adcfb5" + "ID": "57bf652c-6740-44a7-a9b7-469ba33483d3" } ] } diff --git a/ServerCommands/项目/新增项目工时增补.json b/ServerCommands/项目/新增项目工时增补.json deleted file mode 100644 index 3d364850..00000000 --- a/ServerCommands/项目/新增项目工时增补.json +++ /dev/null @@ -1,473 +0,0 @@ -{ - "Name": "新增项目工时增补", - "Enabled": true, - "Triggers": [ - { - "$type": "Forguncy.ServerCommands.Models.PostRequestTrigger, 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": { - "IgnoreBlank": false - } - }, - { - "Name": "增补时长" - }, - { - "Name": "增补费用" - }, - { - "Name": "申请人" - }, - { - "Name": "理由" - } - ] - } - ], - "Commands": [ - { - "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", - "TryCommandPart": { - "CommandList": [ - { - "$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": "0", - "compareType": 2 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=增补费用" - } - }, - "value": "0", - "compareType": 2 - } - ], - "RelationType": 1 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目信息", - "TableValue": { - "TableName": "项目表", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目名称", - "GUID": "77f3f956-399c-44e9-8b9f-4ffd7f550e64" - }, - "ColumnName": "项目名称" - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目预算工时", - "GUID": "c5e6d17d-3ff2-4cc3-9dc1-1d09225040e0" - }, - "ColumnName": "项目预算工时" - }, - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目预算费用", - "GUID": "77ccf1a4-3bde-4c83-92dc-aa4146cdfaca" - }, - "ColumnName": "项目预算费用" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "8c9f3e87-4f04-4df8-9e69-c25dbb5d57a4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "43195d529ba847c3a361bde724f62e8b" - }, - { - "$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": "是否存在申请", - "TableValue": { - "TableName": "项目预算变动表", - "TableValueType": 3, - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "项目ID", - "GUID": "8d9414ec-50fc-4b47-9add-0ced4d957ff4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "状态", - "GUID": "17f93856-652c-4bc5-bb28-3ec9d8e75bc5" - }, - "Value": "审批中" - } - ] - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "f380a95256d64ec69c3ca83b020619f8" - }, - { - "$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": "0" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目预算变动表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "申请人", - "GUID": "d589f664-6d6b-461a-b8f3-26cf453c854f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=申请人" - } - }, - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "项目ID", - "GUID": "3087d854-c35b-4517-9674-ddd7e574925b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "原预算工时", - "GUID": "bd9b0543-b5a2-4047-9b44-446fd0c1df4a" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=INT(项目信息.项目预算工时)" - } - }, - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "增加预算工时", - "GUID": "5dd04dc1-d019-4a2b-89b0-63e57d150a06" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=INT(增补时长)" - } - }, - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "原预算费用", - "GUID": "2bed326e-7eae-46db-a777-57132f6d0bca" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=INT(项目信息.项目预算费用)" - } - }, - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "增加费用", - "GUID": "4875f306-708c-46bd-ac7e-e47bb5b68164" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=INT(增补费用)" - } - }, - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "申请理由", - "GUID": "8ab3518b-bbf4-4b59-9d90-ef7c74deb9f8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=理由" - } - }, - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "状态", - "GUID": "b6ae7a61-2e36-46c0-8cbb-f5b25af20bc8" - }, - "Value": "待提交" - } - ], - "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": "13e02fa1-7b77-4b31-92b6-ed337614bd7f" - }, - "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": "c4bc19bd-b0ed-42ab-b8a0-5d732128d1f3" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新表.ID" - } - }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目预算变动表", - "ColumnName": "流程实例ID", - "GUID": "05011eed-e58c-441d-a1c1-4828158ef0b3" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起流程结果.ID" - } - } - ] - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "申请成功，请等待审批" - } - ], - "ID": "4909f1f8-3da3-4a54-a6cc-28c1ce78a14c" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "项目已创建，但未能发起审批，请手动发起审批流程！" - } - ], - "ID": "9732d211-79a0-4578-98af-9859de3499f0" - } - ] - } - ], - "ID": "9ceb5305-2d28-40d1-9940-65dcd847e6c9" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "请等待上一条申请结束后，再提交新的申请！" - } - ], - "ID": "ea3a5f27-37f9-4b70-b62b-658dc2fe2839" - } - ] - } - ], - "ID": "c044fb28-9b46-4bfd-aeaf-39d927df5c61" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "项目不存在" - } - ], - "ID": "013313f0-b0d1-45d1-9628-fde10321a8f2" - } - ] - } - ], - "ID": "e7ab3e2f-2332-4f06-bc1b-98c9286c7bc5" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "申请时长或预算不能为0" - } - ], - "ID": "0d5fb551-5c9e-458a-8c56-5758538c14de" - } - ] - } - ] - }, - "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/ShareCommandContainers/发起预算申请.json b/ShareCommandContainers/发起预算申请.json new file mode 100644 index 00000000..50ec4b17 --- /dev/null +++ b/ShareCommandContainers/发起预算申请.json @@ -0,0 +1,238 @@ +{ + "Name": "发起预算申请", + "ID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9", + "Params": [ + { + "ID": "30be91f8-0920-4879-bfdb-73a2443b9f1b", + "Name": "项目ID" + } + ], + "Commands": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目", + "TableValue": { + "TableName": "项目表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "d7efb3a8-38c4-46d2-a6bc-2d08e670e3d2" + }, + "ColumnName": "ID" + }, + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "61c1ec65-cd3f-48a9-8b68-9d7924c2f3bb" + }, + "ColumnName": "项目名称" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "91010e04-3eb7-44c5-8c16-59f5106dd187" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + "TopCount": "1" + }, + "ID": "519f99bc4a1d4a65b804e1c358a8cb13" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "检测是否存在申请", + "TableValue": { + "TableName": "项目预算变动表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "项目ID", + "GUID": "16c36d58-158b-4c3e-b4ec-8791bd09ebed" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目预算变动表", + "ColumnName": "状态", + "GUID": "d3f61eb6-6fde-4c19-bb14-19553ae085b4" + }, + "Value": "审批中" + } + ] + } + }, + "ID": "e90b3bfd5a63432d8ceaa19015280acd" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=检测是否存在申请" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_RE_PROCDEF_View", + "ColumnName": "NAME_", + "GUID": "0706ffe2-2824-46f5-9195-3bccbf19a88a" + }, + "Value": "预算申请" + } + }, + { + "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", + "ProcessDefinitionResourceName": "预算申请", + "ProcessInstanceName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目.项目名称&\"预算增补申请\"" + }, + "ReturnResultName": "发起流程结果" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=发起流程结果.TaskExists" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "FGC_任务详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + }, + "TargetCell": { + "SerializeProperty": "传参1" + } + } + ], + "LoadBindingDataOption": 1 + } + ], + "ID": "e7322116-c72e-478b-9fc5-ebcea5b1c15e" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"申请流程已创建，请前往我的待办填写申请单！\"" + }, + "BtnText": "知道了" + } + ], + "ID": "33ebf62b-ace7-4353-83ee-7a1da3487679" + } + ] + } + ], + "ID": "8b1bdfe0-b34b-4772-baa6-953e865f85fd" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": "请等待上一条申请审批后再提交申请！", + "BtnText": "知道了" + } + ], + "ID": "ab1ce99b-c563-4392-a72a-e6da44c9e38b" + } + ] + } + ], + "ID": "4b151de2-b899-4611-9d46-2c51b0713871" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": "该项目不允许发起预算增补申请", + "BtnText": "知道了" + } + ], + "ID": "9a7a5a0d-36b3-4266-877d-78367216cc5e" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + } + ] +} \ No newline at end of file diff --git a/Tables/项目任务/项目预算变动表.json b/Tables/项目任务/项目预算变动表.json index d09f6883..20621a5d 100644 --- a/Tables/项目任务/项目预算变动表.json +++ b/Tables/项目任务/项目预算变动表.json @@ -32,13 +32,6 @@ "Name": "原预算工时", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", - "DatabaseColumnType": "bigint", - "MaxLength": -1, - "Name": "增加预算工时", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", "DatabaseColumnType": "float", @@ -46,6 +39,13 @@ "Name": "原预算费用", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "增加工时", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", "DatabaseColumnType": "float", @@ -69,6 +69,7 @@ }, { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DefaultValue": "待提交", "DatabaseColumnType": "nvarchar", "MaxLength": -1, "Name": "状态", @@ -76,7 +77,7 @@ }, { "$type": "Forguncy.Model.Tables.FormulaColumn, ServerDesignerCommon", - "Formula": "[申请人]&\"申请增补\"&[增加预算工时]&\"小时，项目预算工时合计\"&[原预算工时]+[增加预算工时]&\"小时，审批意见：\"&[审批信息]", + "Formula": "[申请人]&\"申请增补\"&[增加工时]&\"小时，项目预算工时合计\"&[原预算工时]+[增加工时]&\"小时，审批意见：\"&[审批信息]", "Name": "描述", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, @@ -88,7 +89,7 @@ }, { "$type": "Forguncy.Model.Tables.FormulaColumn, ServerDesignerCommon", - "Formula": "[原预算工时]+[增加预算工时]", + "Formula": "[原预算工时]+[增加工时]", "Name": "增加后工时", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" },