diff --git a/.collaboration b/.collaboration index cf3d3244..9196c750 100644 --- a/.collaboration +++ b/.collaboration @@ -518,21 +518,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T16:28:16.6669911+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目列表.json", - "Pages\\项目\\项目列表.rd", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员详情", @@ -540,17 +526,7 @@ }, { "ModuleName": "PCPage/项目岗位详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T16:09:03.111743+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目岗位详情.json", - "Pages\\项目\\项目首页\\项目配置\\项目岗位详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目分组详情", @@ -570,17 +546,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T16:23:44.3187998+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面", @@ -592,19 +558,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T16:12:00.9304992+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -624,21 +578,7 @@ }, { "ModuleName": "PCPage/项目成员", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T16:10:13.602667+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员.rd", - "Pages\\6899a8cead694b3ba00307b6756dbd7.json", - "Pages\\6899a8cead694b3ba00307b6756dbd7.rd", - "Pages\\007ea4aa4c7440478a9a092179dace8.json", - "Pages\\007ea4aa4c7440478a9a092179dace8.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷", @@ -690,17 +630,7 @@ }, { "ModuleName": "PCPage/项目审批", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T16:30:19.8488289+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目流程页面\\项目审批.json", - "Pages\\项目\\项目流程页面\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/预算申请", @@ -740,31 +670,11 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:51:20.9905489+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json", - "Pages\\任务\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:56:52.7405063+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务部分.json", - "Pages\\任务\\任务部分.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-侧栏", @@ -772,17 +682,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:52:21.9513435+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -1982,17 +1882,7 @@ }, { "ModuleName": "ProcessItem/新增任务流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:57:22.6918595+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\新增任务流程.json", - "Process\\新增任务流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "PCPage/页面反馈录入", @@ -2152,17 +2042,7 @@ }, { "ModuleName": "ProcessItem/项目立项流程", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T16:35:17.6633198+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\项目立项流程.json", - "Process\\项目立项流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "PCPage/创建项目", @@ -2206,16 +2086,7 @@ }, { "ModuleName": "ServerCommandPrivate/递归删除任务", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T15:48:32.330895+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\任务\\递归删除任务.json" - ] + "ModuleType": 27 }, { "ModuleName": "TaskScheduler/新增任务事件", @@ -2291,12 +2162,6 @@ }, { "ModuleName": "ServerCommand/删除指定流程", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-21T16:16:08.3674014+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index 0309ff4f..21df57f7 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -2390,7 +2390,7 @@ } } ], - "ID": "c9e7bd03-1944-44fa-ab74-c306ea95d627" + "ID": "376f6a2a-3974-494d-ac7b-8f8b11627020" } ] } @@ -2414,6 +2414,38 @@ "RelatedDataTableName": "任务表", "ConditionFormatRulesCollection": { "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!任务ID=\"\"" + }, + "Priority": 7, + "GUID": "351faf93-8d96-48e8-8960-479d5746c480", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=OR('任务-基本信息'!任务ID=\"\",'任务-基本信息'!父任务负责人='任务-基本信息'!当前用户,'任务-基本信息'!项目经理='任务-基本信息'!当前用户)" + }, + "Priority": 6, + "GUID": "f7c3f6d5-8b51-481e-abe2-d1a7b9beee5e", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + }, { "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { @@ -2499,38 +2531,6 @@ "Underline": null, "Strikethrough": null } - }, - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!当前用户='任务-基本信息'!项目经理" - }, - "Priority": 6, - "GUID": "f7c3f6d5-8b51-481e-abe2-d1a7b9beee5e", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": false, - "IsInvisible": false, - "IsReadOnly": false - }, - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务ID=\"\"" - }, - "Priority": 7, - "GUID": "351faf93-8d96-48e8-8960-479d5746c480", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": false, - "IsInvisible": false, - "IsReadOnly": false } ] } @@ -2577,4 +2577,4 @@ "Formula": "'任务-基本信息'!$C$12" } ] -}//79BbwQI5dkZ2pkFywD5xiWI0r+T53FBfSzRQakMc0l0UJS9RnHN7eE2c7E4zy3FKZ358NgQmtsu+FtDH0VsxHU6gTFv/5xjpY/XPv4YUyIDbTbO2fTIh6vrp/UdUrJ4zyK7aZigOilNdLqRLV+uykh6V5kSLdV/TldX6/1dO6PKVP0ufhHcJ46mF3BXx/1XWSurwVQZZPD/TyGPTXOV1X9tnvG7ISKL84vlBfqaYzrMwkNplitR+swsLnc5wfVq6YzmDHCYKQWohhShf/2h1ZzNN6g8wxj2Gd+eOnlFt5+4Zyx+tG1KHDNjkd7HOwJTuRPsbu4uP5koXOEvebvXi7RARRiSiYfuvXjdPj0iO8l80SmhXKajtHfXXcAPn565POVOZyYIOE2k02vHDnpMHNXHcIoGBii011hjGMSejOL4ZDgqCVxe/1mpew25uJM9dbXV3fthJcnMR12VyKWfh5rNaTKAClX26umy9nVIjIAlR4gT8cmgJbJPMa+vrxe7wCReGkz23HM0eF+vc126WdIdAEWe3M3GWrd6GLGjEJn2N9Tq7hj1hObUqSoSshVWgt6cHNGHUBj5/jAvEWYWT/G9NFbuB1NXVQ7NLhncbEl+0Ro7qsCZJPFcLzZefkao26YcnPbp70pDARXJ0DLmLObNzL+JJXpJM5RmixvC30i5m77EE3fVfDqE5YHh+9l7AEjlmY5d/Ou+ELV6AxTwVmOjwSqmJNpPmvY32SYw6YN8fYI3xu9bWdCveW/tC3dYLy8uLlTKkeDowjCYe/Vd7RUPdlGdbk/jeKBEuOUms7saTrvMLLgJaaGQnVmmD1UF29uoYLEyKKEW3NMDp51Iqo27Oooke+HIcHgrBvHwRViuouh27RUvOHEDPsc9lpBkpSZmf1VXc5/rtL31Ux9Nu+A==|920 \ No newline at end of file +}//dXg42Dcn9Kfs4vefSAPKpa49yhwP2WnSix1ZpO2jpWNAtqppnzit7ERpDuzGU1WwyeqoQ6JVVCbUJyIKyE+f4XxSIHeNSW6PoC+T/oIebB/iYBtOIL9E8kVjyF2j+xK2AJmPUrvvB/ftCt+E4iNOnDuI65i8rxGAK2kfHmEIxGmguH0QtrGP4TtXYkoFCNdHPX+SwEL9Uc34yk+j2ckkuzLAxCdCLokBYx+Vwk/clhT+vBhu4OVdB+b2mhamC6DCXagmdQIgg9NVRT2lSJzLNuHEie9VmgXVUdv8bYSKs8toqzzlX5ouHETunHWEtV1jfMeD4O6QH6+wTbmzjz4oV8VP9aOxIkYV+h5SDaO3c8KjgE8efoCInsD80trImAlpW7T33plqKIW436XvpLMNotE5O1sLyRVjXQHdADsKmZYSpMQ9EZ9RXkzx9tFzOSwmJYX2vN4EgpF0nex9m2hZUqrrqjReQpmwdyJTCKLyvusTCTqnpiVHh7IQCjQNu5U4fEXWTCgnwW7Mbzzuc2wmBqMZO3jFbioqeIIQbbNWFbs5iek0dvpvNq68KO/Plv2QyKKRLjgwgiSeJTnz1P1uwShB+lGJACPSofaM4z6oUgaGeA0+3N2UXcVrBJWbaWk/2jTx09AJGJ0GlcJkHKgdh8Wa4uO+WGHA427WkJ4vQ/y2ufCa8CYzjaQZJwScTDjWnJeQsNakiJRMtYnuRVDEq6JyT4Hi3/3n8wLLg6Pxuy5dbt2B5KVcdyrTJr3Q/bIuc5JniFmAjW7yZg0y92d8E6F79O/YWXXALvWEs2jewvjH7LYNrMZ7ti0BtKvJ8C8nCoS6wRqj9iTskUfeJbZxZmcmxNb/4ZIaWElr/GnjC1S+XhQMosV+1xkAy7TYVatr2e75u5Iwd4YnVBZRpeheUQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务部分.json b/Pages/任务/任务部分.json index 360767ec..f6f9443d 100644 --- a/Pages/任务/任务部分.json +++ b/Pages/任务/任务部分.json @@ -416,120 +416,127 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=任务部分!发起流程结果.TaskExists" - } - ] + "$type": "RemoveCurrentRowInfo.RemoveCurrentRowInfoCommand, RemoveCurrentRowInfo", + "TableName": "任务表" + }, + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_HI_PROCINST_View", + "ColumnName": "ID_", + "GUID": "7d524bc6-89c0-4911-89f0-99685f28adb2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!发起流程结果.ID" + } + } + }, + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_RU_TASK_View", + "ColumnName": "PROC_INST_ID_", + "GUID": "2fe5e0db-45fd-4bc4-9df8-02694cd92581" }, - "value": "1" - }, - "CommandList": [ - { - "$type": "RemoveCurrentRowInfo.RemoveCurrentRowInfoCommand, RemoveCurrentRowInfo", - "TableName": "任务表" - }, - { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "ACT_HI_PROCINST_View", - "ColumnName": "ID_", - "GUID": "7d524bc6-89c0-4911-89f0-99685f28adb2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务部分!发起流程结果.ID" - } - } - }, - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务部分!项目ID" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务部分!任务.项目ID" - } - }, - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务部分!父任务ID" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务部分!任务.ID" - } - }, - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务类型" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务部分!任务.任务类型" - } - }, - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务分组" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务部分!任务.分组ID" - } - }, - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!执行者" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务部分!任务.任务负责人" - } - }, - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!版本" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务部分!任务.版本" - } - } - ] - }, - { - "$type": "SetFocusCommand.SetFocusCommand, SetFocusCommand", - "TargetCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务部分!任务名称" - } + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!发起流程结果.ID" } - ], - "ID": "7fc5a22f-5e1b-4c1b-9a13-e0199febf4e3" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_RU_TASK_View", + "ColumnName": "ASSIGNEE_", + "GUID": "efec1bcc-a0a0-4580-9fce-5332037e50ca" + }, + "Value": "%CurrentUser.UserName%" + } + ] + } + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!项目ID" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!任务.项目ID" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!父任务ID" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!任务.ID" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!任务类型" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!任务.任务类型" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!任务分组" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!任务.分组ID" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!执行者" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!任务.任务负责人" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-任务信息'!版本" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!任务.版本" + } } ] + }, + { + "$type": "SetFocusCommand.SetFocusCommand, SetFocusCommand", + "TargetCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务部分!任务名称" + } } ], - "ID": "d273ffc4-0fad-4ed4-aaf0-66b9ebb2ad44" + "ID": "2f0aa622-6f4e-47e3-a3cc-693e97bcb560" }, { "CommandList": [ @@ -544,7 +551,7 @@ "BtnText": "知道了" } ], - "ID": "15b25a07-8930-4ebd-beb5-b3bda13bc621" + "ID": "23219165-e3bb-45af-ba6d-e99478b26687" } ] }, @@ -1119,4 +1126,4 @@ "Formula": "任务部分!$A$19" } ] -}//Y7XGUOBVcbAKM0D/AthnpENQlTrJDiCKm70bm0cX4/VtRgQp9NB2faDsrnDCGcTEGqHmSOsztJnNBphDwmtERSa57+vykeGWniJuHX3fyiEwemJCG+OsrRwjVlNRZhDvK4LIgyNp6kKRLu0N6Gb+GCEYFxq+8OX6Fpb7LBO1f4hzTmh9ND92mgwPlkj2KqgZYxuYF4kBkgWuRfP7zt8YgCKy72m4bwm8r6qux4ci6MxNcKoamvBNRnr4CPVOQSIYeNtaQdQnlxmjguUI7cHqfa5tkJl847zgHZ3FbQAX5R2bO8lGFYZV+iVhjq4DSDVIwd6ERhvZ5VKvZJx2G9lEynWXTmumCru+L3qsURiAQuJgZLGHA5epSns0uSOmzpg9HdMglTzzJYIU4Fl1GCqkKHmD+K8z6hHxVcMmv+88xXS6orzfxe0aFHF6vAm9yqGGUm9xnpTL87Rl8HTTYs7TaDEzymwTFJqxC+77ZHlvBf4MB4Rouw+P3I1wiyqNCBFNIKZoVeKZO97C9LuZKN5phnrdmjAUNyOSaEPFCdz48WSgfkJkEONY+zdRDNBb8UobhcAhCJvaIAV7s0IA+skd33S1l6N77hwuI8nEpgT/m40iIDn8s4V2o0DzhDHY7jUdiaLiV4l3N4XFgXHRHdyQ/zE+T9O67seaCSqILHlMLS4dNg2hOHasY4iHDSAfUw8dXr9Gm8zChNd6Tp+T9IITfUq3no8H8okDxAlj86RcMexH0COdLFkoYXmixgM1JeTEvZERlCKjDFwz7vounXU8paxIHaj+yFi6NGtSQPy5AkZaOcyhWLeH2uLpVzeOEUbS2KjYhU5wlwtPozmu+heaoA5CPV/GekUIDXBVuvGe2tCGVEOO3roEcWLVw+T4jq0tGlw4JAr9yrBuwvXXUzhXMA==|920 \ No newline at end of file +}//CzIzRViKowwGwAzKx795bQZRK6K4MQQB1P/H8aXubeCB2gMhm4K6eaD7SxsPlL7Ui0emtlIMSFQ+PqlTyowcCbA8Fr8KvbzI4E3nTcZWtaWmJN9TmlG34prAHeGUbXRivs4oonXwgJ2LR5v+HZFe+XgngVAKi6+RIrcTE8gjnXi6mABNMV3lJkh/pVyOEVeoKRba2khidYYG1tDWponxpcCkeeOLrPk8wx/UrnwbTu4lQtwRnaDmcsKTzdx5trq5s/5Qt9vG0xPcghqxeCNLnJspnDq0MS3ZJSis72NPMiOOAIMiI4Pggn9x6qnTNuHkYjzw6hjpUpouGxwl7MmN4GbxfOr/mPLQp5ocRH7Rpw+jsn6t3z+4d1X/msIiUZ4VkaqCjbGEb3d/QywAnJ2PASgSmQI0DP/IRqyAyILhBl+fnHv7f5R3yWxHOfX4RofzeDdh/uPybCjSX0S/Be6M6DCPBoLWuzFLvCH+MTZKRnVS+B+RMe+RyB9Pet4QZ9VP2pSfmDn38oibyER2agLYqLKEdDMndI9AdYpXTz0HItbZ1iQ2EVdWt7Ux9hJvTWO8vj8cXDHErcq78HkWncojsvmta57Qmw064DxVMN7pVvx8JO0x4Xy7REPUNd1WgirzdFKXJwpi6QV4DuQiDRW+5g+8y2YxRrOpCmCnz7aZPY1REHRP5dFhtg7rQDVn5+RHwxPuTHnVvTc1hd/B5dZtM+1/uQfzCCozeDZ1i7Vbtc8GH8APEo7vhNorzaHRKVC2QJmQ/WYKY33f5VysDuIeTSvyJTbw8J2gCHeUg/bgZmITDtoq7IDq79utZw7BXN5cgHvLJ9H9X0P4XFi1Pflos3gYEUBV/usRmAxF4WJ3wlFnDbfGiJZgCvsgXwEqqdZ0cB+TMN1Xy+vuubqEVMVXxg==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index 1b924bc2..6cd376cb 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -219,6 +219,7 @@ "6,1": "任务ID：", "6,7": "项目ID：", "6,14": "流程ID：", + "6,21": "父任务负责人", "7,1": "工时分配方式：", "7,7": "总计划工时：", "7,14": "参与人数：", @@ -1063,17 +1064,38 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=任务首页!流程实例ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "ACT_HI_PROCINST_View", + "ColumnName": "ID_", + "GUID": "bfbb803c-9ea4-4e0e-aed2-44d33fdaf04b" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务首页!流程实例ID" - } - ] - }, - "value": "%Null%", - "compareType": 1 + }, + "compareType": 1 + } + ] }, "CommandList": [ { @@ -1119,37 +1141,36 @@ } ] } - } - ], - "ID": "559daa8d-9901-4347-96d8-90cbee0ee1c1" - }, - { - "CommandList": [ - { - "$type": "RemoveCurrentRowInfo.RemoveCurrentRowInfoCommand, RemoveCurrentRowInfo", - "TableName": "ACT_HI_PROCINST_View" }, { - "$type": "RemoveCurrentRowInfo.RemoveCurrentRowInfoCommand, RemoveCurrentRowInfo", - "TableName": "ACT_RU_TASK_View" + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!B2" + }, + "TargetType": "Forguncy.ProcessPanelCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "Refresh" } ], - "ID": "304fb53e-3929-4143-aa90-bca055067f16" + "ID": "dd0aeedf-03a8-4f49-bb2a-6d969d0b387f" } ] - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!B2" - }, - "TargetType": "Forguncy.ProcessPanelCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", - "MethodName": "Refresh" } ] } }, + "6,24": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "f5906b98-f4ed-4aab-898d-f6ac1d97da4a", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务负责人" + } + } + }, "7,4": { "BindingInfo": { "TableName": "任务表", @@ -1548,6 +1569,11 @@ "BorderLeft": 1, "BorderRight": 1 }, + { + "BorderBottom": 1, + "BorderTop": 1, + "BorderLeft": 1 + }, { "FontFamily": 1, "FontSize": 13.333333333333332, @@ -1780,29 +1806,29 @@ "6,21": 21, "6,22": 14, "6,23": 14, - "6,24": 14, - "6,25": 14, - "6,26": 14, - "6,27": 14, - "6,28": 14, - "6,29": 22, - "7,1": 23, + "6,24": 22, + "6,25": 19, + "6,26": 19, + "6,27": 19, + "6,28": 20, + "6,29": 23, + "7,1": 24, "7,2": 14, "7,3": 14, - "7,4": 24, + "7,4": 25, "7,5": 14, "7,6": 14, "7,7": 13, "7,8": 17, "7,9": 17, - "7,10": 25, + "7,10": 26, "7,11": 19, "7,12": 19, "7,13": 20, "7,14": 16, "7,15": 17, "7,16": 17, - "7,17": 25, + "7,17": 26, "7,18": 19, "7,19": 19, "7,20": 20, @@ -1814,24 +1840,24 @@ "7,26": 14, "7,27": 14, "7,28": 14, - "7,29": 22, + "7,29": 23, "8,1": 13, "8,2": 17, "8,3": 17, - "8,4": 26, + "8,4": 27, "8,5": 14, "8,6": 14, "8,7": 16, "8,8": 17, "8,9": 17, - "8,10": 25, + "8,10": 26, "8,11": 19, "8,12": 19, "8,13": 20, "8,14": 13, "8,15": 17, "8,16": 17, - "8,17": 24, + "8,17": 25, "8,18": 14, "8,19": 14, "8,20": 14, @@ -1843,39 +1869,39 @@ "8,26": 14, "8,27": 14, "8,28": 14, - "8,29": 22, - "9,1": 27, + "8,29": 23, + "9,1": 28, "9,2": 17, "9,3": 17, - "9,4": 24, + "9,4": 25, "9,5": 14, "9,6": 14, - "9,7": 24, + "9,7": 25, "9,8": 17, "9,9": 17, - "9,10": 24, - "9,11": 24, - "9,12": 28, - "9,13": 28, + "9,10": 25, + "9,11": 25, + "9,12": 29, + "9,13": 29, "9,14": 13, "9,15": 17, "9,16": 17, - "9,17": 29, + "9,17": 30, "9,18": 19, "9,19": 19, "9,20": 20, - "9,21": 30, + "9,21": 31, "9,22": 14, "9,23": 14, - "9,24": 31, + "9,24": 32, "9,25": 14, "9,26": 14, "9,27": 14, "9,28": 14, - "9,29": 22 + "9,29": 23 }, "RowStyles": { - "4": 32 + "4": 33 }, "SheetStyle": { "FontFamily": 1 @@ -1906,7 +1932,6 @@ "7,21,1,3", "8,21,1,3", "9,21,1,3", - "6,24,1,5", "7,24,1,5", "8,24,1,5", "9,24,1,5", @@ -1917,7 +1942,8 @@ "7,17,1,4", "6,17,1,4", "8,10,1,4", - "9,17,1,4" + "9,17,1,4", + "6,24,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2018,6 +2044,10 @@ { "Name": "当前用户", "Formula": "任务首页!$R$10" + }, + { + "Name": "父任务负责人", + "Formula": "任务首页!$Y$7" } ] -}//tdE9bTY+KNyjlATGw9Ngcst8j13lRUyTk2iBzz+YG203C9P38V3lgsLtS4DfezvxSAs25Gwar48MwSvpVBgmI8rnWR4St8XltBE2HTHLYvhzU8viZk7fNFI1wNcWhJayW3jmDh+f682SbGZ1ttq0dngfDsJZbCAu85BiojZvOj2GIWH4D4nxS5Ru6/pbtQPLEqFi81F3loM/pHVEGXR6wN4dwjXF2SaPAW4warV+fOVJCGtTj8Yb1ZBAT5NM0ZqlN6cpws6xG30chPJ4vwLzmG75pnweGkhSVf4TXjSgrDG8B2XCyTjQIjSdiKvoJXIGwzfHtEWE5JII/knxI3abQFs1aDNH60eu33WqDc6pJWA9NNNLtqovCl0u/e2dSRtCVmDc7LOkK/GYWRMofowMj7JvXT4RGJrXcJK4le3m4VUn2y2nD20tm52NDr4t/bVvviqgmPufLAaMYNAZNOkeAZoKZTiziTY/rEun12BLlcjHB72oJxc2Zz++OX6oj5ig+8QrUr10Cj0WYmg5R+q3KKBOCu1Wg4g9SBE430MkNMfkkTcMr314anhtPufwal20jnmMPizlNXOi4K582Z7VE0sQQdzMpxG6MN7ZHcujsHgQdjPqIh3+wIh6WTs92LPYD0oXNU1DLXq8UkDUu/oQQrhcwGGYZqYu0W/V1ZY5HZFL1i91qC6cGZ9nv0wpj73hCqXGCKYAAJJA1xuQB9nJaw7wsc6e/cMzWtAZJcdLyIgeB/n4R8l6O/iTTJVKLEXeRgBnpfO0/Oh11X+BuGdkrYdisjEnMM5ExaqETREukc4uFrupgI+JygaD5AeI3ffpidiePVEa4qoHF1EsWfw+xEBbciwNSTR+D/M4EeqHI+h2dk1C1NnAS0rkT9V0Wui/lp4Io7wM/9UHH1v6Dx23jA==|920 \ No newline at end of file +}//g2JEjqTkJB96xwHd8M86nXhzXHXQyvMQ4L0Xka+dUqsx1wHAlVVf3n04H5VUwPkLqRsG8NwVIb5b5iBZVCG7DVdUlI/snl5qg270p6e4GSXAn6Z5Alk0Vs+YaEBBr8WUbgb5rC56ktd/+qaw/Vj5Sc67JdQsPMtJebY7ovZFnbYQbHGlXRq/Rdk0BG7R5YncDx/G4beUCZRudHcLZll8OJv3jEoFv6i3aj9m0tWmksyZEzJQIctHESLX59WDUL3ctuJDbN83ns5rbWDEqIFn8ic2szfMVKCNItEVGx5qDemlfQVEfwEc9y70sSQMnGM9eYqNH411vU27jAtsaceciyd/8dKTvuc1dQY49Bfg5hjMCxawMXETdSHIE780AHWv40549ndrnyDDSNWyVQIQPV4dKvpoImVgrHKwio41Y4nzFsu+8u47ohj7tYdAvG4Qfg4qFJYebojxIAuO6RBdRTSqknbUjTLxZ2cfoOHBArRRYqIaoLIzTgSHDTVmejsE1nW9y70QTvWv7YWYOeG+YxSrJ0dLbmQb9Pu41gyO33PSz0X4KmrN0ZPkYuJtTGbkAPIJftHXWPBh4pgxTim6giIkKSlIWtG3bkqsMyJJndoqGkqpJgMfThebpgRyJKm2GIkYmfWQRu5/KZ84b8n8th2ovt038VEhTbPrt28QkQ100dpq4IBVvjzO3Bk7pF20tcgFs7a/7veFK0K31UM3A4S6ZfzRnn1fZGjwoataKygiEPYcMaT8xaIMHZVTjgyViCZCqRZxRQzri/HEXZVQ7XVNpyCXmJ96olvbpyK5TYZ9/RIr/b8JH8WJCS/V76RlsxeWKbbssjKuWzZ9n/9fVB7CcyAp2kgH2Y3MZEDG7aSOh5OINaKbAWne0x8AbF0DxmtBJWRMo6Djbm2UIs9pqQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.rd b/Pages/任务/任务首页.rd index 88c35995..e254ea1d 100644 --- a/Pages/任务/任务首页.rd +++ b/Pages/任务/任务首页.rd @@ -70,6 +70,10 @@ { "Name": "当前用户", "Formula": "任务首页!$R$10" + }, + { + "Name": "父任务负责人", + "Formula": "任务首页!$Y$7" } ] } \ No newline at end of file diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index 954578ae..86d55643 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -407,7 +407,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "当前用户", "ParameterValue": "%CurrentUser%", - "ID": "0dba67a93c894f1f8067258fb2a58abb" + "ID": "572d8aa01b794aa1945ca17e2c3fad9a" }, { "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", @@ -437,58 +437,170 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=发起流程结果.TaskExists" - } - ] - }, - "value": "1" + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!新增项目临时流程实例ID" }, - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "DrawerDirection": 3, - "ShowDrawerHeader": true, - "ClosePopupCallbackCommand": { - "Commands": [ - { - "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", - "ListviewName": "项目分组图文列表", - "UpdateType": 6, - "UpdateListviewCommandRunTimeMethodSetting": { - "MethodName": "Reload", - "ParameterValues": { - "clearFilter": false, - "clearSort": false, - "clearRuntimeQueryConditions": false - } - } - } - ], - "ParamProperties": { - "IsOK": "是否为确定" - } - }, - "ValueFormula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!发起流程结果.Page" - } - } - ], - "ID": "33bf16d8-2df5-47af-a0db-b3961b43138e" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!发起流程结果.ID" + } } ] + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "DrawerDirection": 3, + "ShowDrawerHeader": true, + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "搜索项目", + "TableValue": { + "TableName": "项目表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "立项流程示例ID", + "GUID": "888159f5-42a7-482b-8c76-06136cad3e64" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!新增项目临时流程实例ID" + } + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "065a1508fb1044198a9ec3b257eec4a8" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目列表!搜索项目" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "删除指定流程", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "流程实例ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!新增项目临时流程实例ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!新增项目临时流程实例ID" + }, + "Value": "%Null%" + } + ] + }, + { + "$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": "=\"以为您删除刚才创建的流程\"" + } + } + ], + "ID": "75dad0af-8e41-4dbd-b693-b41ef7cebdc5" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"删除流程失败，请手动前往我的待办，处理刚刚发起的流程，原因：\"&项目列表!msg" + } + } + ], + "ID": "284e8176-c2f7-4b7e-ab6a-860cbd3f6aa3" + } + ] + } + ], + "ID": "36940c5b-aa05-4e2c-ba2a-9dcb556a96f8" + } + ] + }, + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "项目分组图文列表", + "UpdateType": 6, + "UpdateListviewCommandRunTimeMethodSetting": { + "MethodName": "Reload", + "ParameterValues": { + "clearFilter": false, + "clearSort": true, + "clearRuntimeQueryConditions": true + } + } + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, + "ValueFormula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!发起流程结果.Page" + } } ], - "ID": "188449ab-f58a-4131-9e5d-364a69aa06d2" + "ID": "6fdf534a-a0cd-4a89-9402-7b17333905c5" } ] } @@ -965,7 +1077,7 @@ "3db70195-fce8-4da3-b3e5-e56009ee399a" ] }, - "10,40": { + "10,14": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1609,7 +1721,7 @@ "10,7": 11, "10,8": 9, "10,10": 12, - "10,40": 11, + "10,14": 11, "11,8": 13, "12,1": 14, "12,8": 15, @@ -1670,7 +1782,8 @@ "12,1,2,7", "15,1,1,7", "12,10,6,32", - "7,4,1,2" + "7,4,1,2", + "18,14,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1740,6 +1853,10 @@ { "Name": "选中分组", "Formula": "项目列表!$B$19" + }, + { + "Name": "新增项目临时流程实例ID", + "Formula": "项目列表!$O$19" } ] -}//OcHIpQ4sWgMsUCkC54qPrQ14Xpx9gtw6GydyBgvPomgavA9TdHAskxvrXeMwWkTuUXojruiXSBYXKX0SE5wFNObtBQhVLI34fhAUOGBvPpCaUknyYRwlW8tadjj1h4DSOCg9lwybJLDsIZzinQywqXW10uBEoKqSsPNWMvN9yHIv2Eit4N0gIGZAPioV1GeoWiPLQpzWcF4hRypCZwu7x5ckQJUxn2VtfNXSBKQHUfFWa+VwT9cM4N94VCgwKc9tvAxCJiiE/P17ebFJx+AtFq5qdey8LFAeZXZpvUiV1uw4Y0oZxvMGn56K+NGMXuZIywZ6Ik1vNuXaYOpKaYx3HubjVcv+2x4PLFhHhODZZ6AXlG1SDSTuwBGAMTeb8p4so+rtmGcEBP3zuJa7r3qTMre1bRGkvhTBV1SUYIEaRljPdhNZDxFoWrunpjyEjmI5mZx+aTb34Ua/QLbjwzPF7YPApTwXi66NanAhyySz5/yyEyGCH7dt+yIZCfF7QuzJeXFMAXYQP0Scz/6vTRZTxo3EiG2pG/x69JrTiOzGE7eCDKuvOyffiPRpxjgg7ekdpQ4W/Jc7PiE1kthr+vgStOgwvZangSAwoPwbyTNA0pqAXMMwiQPXnvZYEQVR/R7KVf8NBm7E1sC9l4lIkluIZO/XrEfz2a4Dos7FUNwKTtTJBYNTwkqEUCH3Ss+nuLuwSnDhi8r5stQWtCQpvzf/lzURXdMr3LwyEdFeT6YHMfRXidnPf3MJOd2WldgHVIaWW33eVwpmVT2gtTqmpiA32Us5cfotfIXOA9ViVZNZxYQP434M1fyQSEadlx/v88W75vSReCwt5EVQaNvv7V42dK+2HidS+ny5jbFUwtdU11xiguBWEk5yUPXzN5Zvel7VIKVYYj01F3s1Uo3D2cIuXA==|920 \ No newline at end of file +}//Uy2H2CCirK3sZH+DmJnFoF7HtPetcIFnlU2QN/VKibgYP6rFtKjzk7bT8DenrGRQzcHVXtkt8O/zcYIgaIsoBZ/odtT9A6kiXyht7BCoZsWNWRlT4K8pi14/0s3Q/rQKh8WR0Lb83Pdas5lPp6aV0qLTtZ37cQwAymonZjv44BwXDwiVCiLGUXPWxSROmkBa3aUMYTNPYThGk3yVCohX55xAJtFco+LTLZG5i7csadUF2R79UkWflj6grVu3Q/g3xuerah1iptRSRoSxbchsBhEJRisHh/kNfMOfTPMOAFFqVlYhz5ANCSGOgh9rxZhw4T0ab5f8mr76niFcKph+6LPVKHefR6qxq5F81z1y0bxXhOQZZyAZShoekrBZq+7gJB4qRYh1/1ytdXaI3h25rkJqttXpT9ropqyaWKNwHC+i+KdKS2MwvOCB5bZtruvWc2rCBWdEtK6jEp5NvnttWi9jQDIsyuFipYih+ZdKCyAefC8qBFzmHPfmszolNsMXFaY8wnOLoLU1UNAUk+cbe0z+12kDQ01oUdxvs0naEa4duKudPxyxQaXc1Fu7YqNyWRHFk4jwseGVQdhc/H0ipPVsdopED4lM/dEqkh7DVVY2ozDjfFFwPIcsgWO6zgbIItsu6zLnkjSj+KMRpc5vT9GcTSi6lbOeeFI0qmK1/+9SXy+cXDCPSyvMk5+CVjBWU7mPl5JakqZ63qUOyqmk9jk2OmiQp2jyeIyx2EKMqOfmFWmNgtcNkgd/0WuM8qmKd7ely6NT9Htm7xxfkUxxKR5ui5zlE253V17mwXTpKftgWM/1ol/DmVt90JoooFRafANSVxcFopsAkolJs20cbEL+SEcLvviW0YqoBt3SrPWtZyfa+0qUXeYwcwbgE0D6AtrOG1ugJ8YiPZer5rCp5w==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.rd b/Pages/项目/项目列表.rd index 66ffad47..4fa24d03 100644 --- a/Pages/项目/项目列表.rd +++ b/Pages/项目/项目列表.rd @@ -13,6 +13,10 @@ { "Name": "选中分组", "Formula": "项目列表!$B$19" + }, + { + "Name": "新增项目临时流程实例ID", + "Formula": "项目列表!$O$19" } ] } \ No newline at end of file diff --git a/Pages/项目/项目流程页面/项目审批.json b/Pages/项目/项目流程页面/项目审批.json index c8bc2e17..482e1bcc 100644 --- a/Pages/项目/项目流程页面/项目审批.json +++ b/Pages/项目/项目流程页面/项目审批.json @@ -387,6 +387,7 @@ }, "CellType": { "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -515,12 +516,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "1649ece3-faeb-4e55-807d-9cd4aad6e861" + "ID": "94ba8b77-317c-4618-99fd-ca3e0a7a78bb" } ] } ], - "ID": "bdacaec8-cd8f-4f4a-8b43-7ef3b5f564eb" + "ID": "f3de4723-2195-4e11-af83-dd71445fdd1f" }, { "Condition": { @@ -546,7 +547,7 @@ "MethodName": "Refresh" } ], - "ID": "b93ad683-ee8c-4358-b742-eb4d809188d0" + "ID": "51cb4113-a961-436f-afb9-8b6fc4f30c6a" } ] } @@ -629,6 +630,7 @@ }, "CellType": { "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -1428,13 +1430,19 @@ "TextIndent": 10, "HorizontalAlignment": 2 }, + { + "FontFamily": 0, + "FontSize": 16.0, + "HorizontalAlignment": 3, + "VerticalAlignment": 4 + }, { "FontFamily": 0, "FontSize": 16.0, "HorizontalAlignment": 3 }, { - "Foreground": 4 + "Foreground": 5 }, { "FontSize": 16.0, @@ -1466,7 +1474,7 @@ }, { "FontSize": 13.333333333333332, - "Foreground": 4, + "Foreground": 5, "HorizontalAlignment": 3 }, { @@ -1476,7 +1484,7 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 4, + "Foreground": 5, "HorizontalAlignment": 3 }, { @@ -1488,21 +1496,15 @@ "FontFamily": 0, "FontSize": 13.333333333333332, "Foreground": 1, - "Formatter": 6 + "Formatter": 7 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 4, - "Formatter": 7, + "Foreground": 5, + "Formatter": 8, "HorizontalAlignment": 3 }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 1, - "Formatter": 8 - }, { "FontFamily": 0, "FontSize": 13.333333333333332, @@ -1515,12 +1517,18 @@ "Foreground": 1, "Formatter": 10 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 1, + "Formatter": 11 + }, { "FontSize": 13.333333333333332 }, { "FontFamily": 0, - "Foreground": 4 + "Foreground": 5 } ], "Types": { @@ -1529,6 +1537,7 @@ "black", "Left", "Right", + "Top", "Text 1 50", "Background 2 0", "\"严格\";\"宽松\";\"宽松\"", @@ -1539,7 +1548,7 @@ ], "Borders": [ { - "Color": 5 + "Color": 6 } ] }, @@ -1547,39 +1556,29 @@ "1,1": 0, "1,4": 1, "1,21": 2, - "1,22": 0, - "1,23": 0, - "1,24": 0, - "1,25": 0, - "1,26": 0, - "1,27": 0, - "1,28": 0, - "1,29": 0, - "1,30": 0, - "1,31": 0, - "1,32": 2, - "1,33": 3, - "1,34": 4, - "2,4": 5, - "2,5": 5, - "2,6": 5, - "2,7": 5, - "2,8": 5, - "2,9": 5, - "2,10": 5, - "2,11": 5, - "2,12": 5, - "2,13": 5, - "2,14": 5, - "2,15": 5, - "2,16": 5, - "2,17": 5, - "2,18": 5, - "2,19": 5, - "2,32": 2, - "2,34": 4, - "3,4": 6, - "3,20": 7, + "1,32": 3, + "1,33": 4, + "1,34": 5, + "2,4": 6, + "2,5": 6, + "2,6": 6, + "2,7": 6, + "2,8": 6, + "2,9": 6, + "2,10": 6, + "2,11": 6, + "2,12": 6, + "2,13": 6, + "2,14": 6, + "2,15": 6, + "2,16": 6, + "2,17": 6, + "2,18": 6, + "2,19": 6, + "2,32": 3, + "2,34": 5, + "3,4": 7, + "3,20": 8, "3,21": 0, "3,22": 0, "3,23": 0, @@ -1591,74 +1590,74 @@ "3,29": 0, "3,30": 0, "3,31": 0, - "3,32": 2, - "3,34": 4, - "4,1": 8, - "4,2": 9, - "4,3": 9, - "4,4": 9, - "4,5": 9, - "4,6": 9, - "4,7": 9, - "4,8": 9, - "4,9": 9, - "4,10": 9, - "4,11": 9, - "4,12": 9, - "4,13": 9, - "4,14": 9, - "4,15": 9, - "4,16": 9, - "4,17": 9, - "4,18": 9, - "4,19": 9, - "4,20": 9, - "4,21": 9, - "4,22": 9, - "4,23": 9, - "4,24": 9, - "4,25": 9, - "4,26": 9, - "4,27": 9, - "4,28": 9, - "4,29": 9, - "4,30": 9, - "4,31": 9, - "4,32": 9, - "4,33": 9, + "3,32": 3, + "3,34": 5, + "4,1": 9, + "4,2": 10, + "4,3": 10, + "4,4": 10, + "4,5": 10, + "4,6": 10, + "4,7": 10, + "4,8": 10, + "4,9": 10, + "4,10": 10, + "4,11": 10, + "4,12": 10, + "4,13": 10, + "4,14": 10, + "4,15": 10, + "4,16": 10, + "4,17": 10, + "4,18": 10, + "4,19": 10, + "4,20": 10, + "4,21": 10, + "4,22": 10, + "4,23": 10, + "4,24": 10, + "4,25": 10, + "4,26": 10, + "4,27": 10, + "4,28": 10, + "4,29": 10, + "4,30": 10, + "4,31": 10, + "4,32": 10, + "4,33": 10, "5,1": 0, - "6,1": 10, - "6,5": 11, - "6,12": 12, + "6,1": 11, + "6,5": 12, + "6,12": 13, "6,13": 0, "6,14": 0, "6,15": 0, - "6,16": 13, - "6,23": 12, + "6,16": 14, + "6,23": 13, "6,24": 0, "6,25": 0, "6,26": 0, - "6,27": 14, - "6,34": 14, + "6,27": 15, + "6,34": 15, "8,0": 0, - "8,1": 12, + "8,1": 13, "8,2": 0, "8,3": 0, "8,4": 0, - "8,5": 13, + "8,5": 14, "8,11": 0, - "8,12": 15, + "8,12": 16, "8,13": 0, "8,14": 0, "8,15": 0, - "8,16": 13, + "8,16": 14, "8,22": 0, - "8,23": 15, + "8,23": 16, "8,24": 0, "8,25": 0, "8,26": 0, - "8,27": 13, - "8,34": 13, + "8,27": 14, + "8,34": 14, "8,36": 0, "9,0": 0, "9,1": 0, @@ -1697,23 +1696,23 @@ "9,34": 0, "9,36": 0, "10,0": 0, - "10,1": 15, + "10,1": 16, "10,2": 0, "10,3": 0, "10,4": 0, - "10,5": 16, + "10,5": 17, "10,11": 0, - "10,12": 15, + "10,12": 16, "10,13": 0, "10,14": 0, "10,15": 0, - "10,16": 13, - "10,23": 15, + "10,16": 14, + "10,23": 16, "10,24": 0, "10,25": 0, "10,26": 0, - "10,27": 13, - "10,34": 13, + "10,27": 14, + "10,34": 14, "10,36": 0, "11,0": 0, "11,1": 0, @@ -1752,24 +1751,24 @@ "11,34": 0, "11,36": 0, "12,0": 0, - "12,1": 15, + "12,1": 16, "12,2": 0, "12,3": 0, "12,4": 0, - "12,5": 17, + "12,5": 18, "12,11": 0, - "12,12": 15, + "12,12": 16, "12,13": 0, "12,14": 0, "12,15": 0, - "12,16": 17, + "12,16": 18, "12,22": 0, - "12,23": 15, + "12,23": 16, "12,24": 0, "12,25": 0, "12,26": 0, - "12,27": 18, - "12,34": 18, + "12,27": 19, + "12,34": 19, "12,36": 0, "13,0": 0, "13,1": 0, @@ -1807,17 +1806,17 @@ "13,33": 0, "13,34": 0, "13,36": 0, - "14,1": 15, + "14,1": 16, "14,2": 0, "14,3": 0, "14,4": 0, - "14,5": 11, - "14,34": 11, - "15,1": 15, - "15,2": 15, - "15,3": 15, - "15,4": 15, - "15,34": 11, + "14,5": 12, + "14,34": 12, + "15,1": 16, + "15,2": 16, + "15,3": 16, + "15,4": 16, + "15,34": 12, "16,0": 0, "16,1": 0, "16,2": 0, @@ -1855,17 +1854,17 @@ "16,34": 0, "16,36": 0, "17,0": 0, - "17,1": 15, + "17,1": 16, "17,2": 0, "17,3": 0, "17,4": 0, - "17,5": 13, - "17,34": 13, + "17,5": 14, + "17,34": 14, "17,36": 0, - "18,34": 13, - "20,2": 19, - "20,6": 20, - "20,7": 20 + "18,34": 14, + "20,2": 20, + "20,6": 21, + "20,7": 21 }, "SheetStyle": { "FontFamily": 0 @@ -1890,7 +1889,6 @@ "10,12,1,4", "10,23,1,4", "0,35,20,1", - "1,21,3,11", "1,33,3,1", "20,2,1,4", "6,16,1,6", @@ -1907,7 +1905,8 @@ "20,8,1,3", "3,4,1,16", "6,5,1,6", - "1,4,1,16" + "1,4,1,16", + "1,21,1,11" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1940,4 +1939,4 @@ "Formula": "项目审批!$I$21" } ] -}//9V5QVHf1EYXxhPFznlYkLWQVUIsuUps8PK34bYo1hiI4D85VLmYrxI+XFWxNT1P9uOqCAXRAhOd8AqVCHNPyjAuTnQ17K1ejj1OOa+ZCz76l4ZMqwOd2BqU0QjSasUSfW9vBUhQJPx0KhtVSPcvxmpX4hrU9bKJu15mWd4uchAi/9HBWz41h84qg2sltlrYSQ3AM4iXAD6uSAJoQLQ6KtP7Hh0dqZX+YSL87ijhmrbRzXHSBcGdBar5L1DonUVI1RJAu5zYKDZ+e8kVY+7YHL30Wt3uSgU6uZQNUTLUwiPnYTwcRbirK47dyetWgayLehsxxOnFNhbHS1arI/9/WvftCpxVf5OBH/pyeTZ9yzM0UadShoQIm3NAaJ4Aq9EGe/YHBizXOHb3RmVmVEBrK0lrCQ+YfCAbQPdSOgh7n4zBEKxRhYbSCtNmMR3Z+apTsEC+3vl0x5bG+35/JGrR/LS6D4lkfsFoWNsZK9nGvuqdEx0pM4Uj/NeTwvqi5hNt+f8O8DNhHajxmlsjYaHq6RbSOXh/r/3XjvzXJJv6pCX2u4Xw4ZpfWjnWGxTBdNSwOsFCM+Xu3FfVjGN1eV74HNReTB61aCcFJcn430dq2QcmHMQZ2Imb9PuoTREw/h5q5sIpkkqC9cO8Hj2MUv3zO06TIHd7MS7rRQ+O1SkcmaDeD9DQ/hQrmE1Zzcz8CZluVZQBxcxbZTBvJtD0YNmiFaAJgo2tQQUQwnGLBcbm11HyL2zE8ndC2pAODy4QLyo50dV5bL7krg+crxVF/f/G06AcKDcgKpAopJ+CMh5i32tUFWikYofq/AX2vwl/SREciiapJTbi0Z4IYXH6+MHuPXuwZmKG5+jrJ2vAyHghK6hEBXPTTmb13kr2GxyTf1qR6xbk0NjBlofRK9VQZt9R/Pg==|920 \ No newline at end of file +}//Vgi8FmgAea9WdnSQU8i0GvR44CZLtZ9BxAiVzhbw0v62mcoGrDDZhRXtoWxwRVeCDaD4WER2X4msnU1hWhJimbrV61iYWTSdR6VBZnI3TWlXaUfgn8F5OPxewvr2Vq1JRpEsdSuvcO/i0qoai/n7hrK6s+RlsnQ87UYzGpmFfELqqWHvjrFvCl4fOaze9iSk1UDzvqdQi5IK0XBXFkIZareVZf+Q1rKaL9wZBmrQfkL/ZkEhtBJGaMgtQ3fPmNlrwOx/cWYq35mX8KiKJt+xC7cVHeJ/l60Pl6I2Et7GWlm3v5J1l9xthDAFK6Xv0DURtTuybEPkfKxejOPdUkY+G0/66SJxA38lQKGqkXDIcKuIPb3UP3M4X7J3cNQ6uVitbSmzMN4HIrDuvcgqHooI0n9vmYHX9FQsmJlL8dO3V9bY71SaQgl1YV+dfEVF24JFXhE6GRckvOoYvg8qrPiyo6MwnLywrnYwkoPWJaUV7IZOsileyDjXVFL6WV125I2UyUQC3TDJKjOfSK7yks/hR9pKIJ7XsTkJtnCeCnXlRGzLu43T/hdd3Ew1f+aedZvJoZKnkyJquBbgrbR76ARIVfjI8QcMLc7tmhWBOPUywR1txLX2HzFIcbm0+XHtVd4oKQWQZJNUkyaWtaTbRVyOfbTotpOaCpFR/43V1h02mDSZrzRTaHX08PVksBvRNiWmamy1F3dovAp1l4BFKMB/qy1oHvWhx3M68ebA4yUhdq5rqpewigiraFnmTpOE6DzgA/HnywpAmFzhhrgxpfZnYuh/Ehi0q++YGt2a9jI8+sYhzB1vmhoByHTGYOIjdJPhZKdj6sOgtUHgMRuUg3PZzgKN+ZHQ1fV3Q2zX/JW7ufwN1qfqwK7rrjSMUSxmlfeT9DnRLe589wS/PBVlF5rhyQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index de51f2af..af9ad10e 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -8,17 +8,17 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 36.0 + "DesignLengthInPixel": 24.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 14.0 + "DesignLengthInPixel": 10.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 29.0, + "DesignLengthInPixel": 32.0, "Mode": 1 } }, @@ -126,20 +126,31 @@ "DesignLengthInPixel": 91.0 } }, - "15": { + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 225.0, + "Mode": 1 + } + }, + "17": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } } }, - "Count": 16, + "Count": 18, "DefaultSize": 10.0 }, "Values": { "1,5": "加载中...", - "3,10": "进行中", - "3,12": "自定义", - "3,14": "菜单" + "1,10": "进行中", + "1,12": "自定义", + "1,14": "菜单" }, "AttachInfos": { "1,1": { @@ -258,189 +269,7 @@ "UseCellForeColor": true } }, - "1,9": { - "CellType": { - "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon", - "PreCommands": [ - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "加载中" - } - ], - "PostCommands": [ - { - "$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": "=Action.Name" - } - ] - }, - "value": "暂存" - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "保存成功" - } - ], - "ID": "5fb08138-8874-4be8-9853-b738529858ce" - } - ] - }, - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" - } - ], - "TemplateKey": "同意", - "ActionButtonStyleTemplateInfos": [ - { - "ActionTitle": "提交", - "TemplateKey": "同意" - }, - { - "ActionTitle": "回退", - "TemplateKey": "回退" - }, - { - "ActionTitle": "暂存", - "TemplateKey": "暂存" - }, - { - "ActionTitle": "结束", - "TemplateKey": "拒绝" - } - ] - } - }, - "2,5": { - "CellType": { - "$type": "ElementUI.TabHeader, ElementUI", - "ClickCommand": { - "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", - "Commands": [ - { - "$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": "=项目标题!项目子页面" - }, - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!项目子页面" - }, - "Title": "加载中" - }, - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目首页!项目子页面" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!页签值" - } - } - ] - } - ], - "ID": "00b63893-61b9-494b-8dea-b4adbc08d852" - } - ] - } - ], - "ParamProperties": { - "itemIndex": "页签编号", - "itemValue": "页签值", - "itemText": "页签标题" - } - }, - "DefaultValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"ProjectTag\"),\"任务列表\")" - }, - "Tabs": [ - { - "Value": "项目概况", - "Name": "概况" - }, - { - "Value": "任务列表", - "Name": "任务" - }, - { - "Value": "项目工时", - "Name": "工时" - }, - { - "Value": "项目成员", - "Name": "人员" - }, - { - "Value": "项目负荷", - "Name": "负荷" - }, - { - "Value": "项目周报首页", - "Name": "周报" - }, - { - "Value": "项目反馈", - "Name": "反馈" - }, - { - "Value": "项目文档", - "Name": "文档" - }, - { - "Value": "项目版本管理", - "Name": "版本" - }, - { - "Value": "项目代码", - "Name": "代码" - }, - { - "Value": "项目统计", - "Name": "统计" - } - ], - "type": "default", - "position": "top" - } - }, - "3,10": { + "1,10": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目状态", @@ -480,7 +309,7 @@ "b24876da-8ff2-4736-8ffe-09e4d86a7a9d" ] }, - "3,12": { + "1,12": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [], @@ -494,7 +323,7 @@ "IconSize": 14.0 } }, - "3,14": { + "1,14": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -502,7 +331,7 @@ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "PopupDisplayMode": 1, "Placement": { - "SerializeProperty": "=项目标题!O4" + "SerializeProperty": "=项目标题!O2" }, "ClosePopupCallbackCommand": { "Commands": [ @@ -832,6 +661,188 @@ }, "IconSize": 14.0 } + }, + "1,16": { + "CellType": { + "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon", + "PreCommands": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + } + ], + "PostCommands": [ + { + "$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": "=Action.Name" + } + ] + }, + "value": "暂存" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "保存成功" + } + ], + "ID": "5fb08138-8874-4be8-9853-b738529858ce" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + } + ], + "TemplateKey": "同意", + "ActionButtonStyleTemplateInfos": [ + { + "ActionTitle": "提交", + "TemplateKey": "同意" + }, + { + "ActionTitle": "回退", + "TemplateKey": "回退" + }, + { + "ActionTitle": "暂存", + "TemplateKey": "暂存" + }, + { + "ActionTitle": "结束", + "TemplateKey": "拒绝" + } + ] + } + }, + "2,5": { + "CellType": { + "$type": "ElementUI.TabHeader, ElementUI", + "ClickCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$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": "=项目标题!项目子页面" + }, + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!项目子页面" + }, + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目子页面" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!页签值" + } + } + ] + } + ], + "ID": "00b63893-61b9-494b-8dea-b4adbc08d852" + } + ] + } + ], + "ParamProperties": { + "itemIndex": "页签编号", + "itemValue": "页签值", + "itemText": "页签标题" + } + }, + "DefaultValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IFERROR(GETURLQUERYVALUE(\"ProjectTag\"),\"任务列表\")" + }, + "Tabs": [ + { + "Value": "项目概况", + "Name": "概况" + }, + { + "Value": "任务列表", + "Name": "任务" + }, + { + "Value": "项目工时", + "Name": "工时" + }, + { + "Value": "项目成员", + "Name": "人员" + }, + { + "Value": "项目负荷", + "Name": "负荷" + }, + { + "Value": "项目周报首页", + "Name": "周报" + }, + { + "Value": "项目反馈", + "Name": "反馈" + }, + { + "Value": "项目文档", + "Name": "文档" + }, + { + "Value": "项目版本管理", + "Name": "版本" + }, + { + "Value": "项目代码", + "Name": "代码" + }, + { + "Value": "项目统计", + "Name": "统计" + } + ], + "type": "default", + "position": "top" + } } }, "StyleDatas": { @@ -851,15 +862,21 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "HorizontalAlignment": 3 - }, - { - "FontSize": 13.333333333333332 + "Formatter": 3 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Formatter": 4 + "HorizontalAlignment": 4 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 4, + "VerticalAlignment": 5 + }, + { + "FontSize": 13.333333333333332 } ], "Types": { @@ -867,8 +884,9 @@ "Body", "Text 1 50", "Left", + "[AUTO]General", "Right", - "[AUTO]General" + "Top" ] }, "CellStyles": { @@ -878,20 +896,22 @@ "1,1": 1, "1,2": 1, "1,5": 2, - "1,9": 3, + "1,10": 3, + "1,11": 0, + "1,12": 3, + "1,13": 3, + "1,14": 3, + "1,15": 4, + "1,16": 5, "2,2": 1, - "2,5": 4, - "2,9": 4, + "2,5": 6, + "2,9": 6, "3,2": 1, - "3,5": 4, - "3,7": 4, - "3,8": 4, - "3,9": 4, - "3,10": 5, - "3,11": 0, - "3,12": 5, - "3,13": 5, - "3,14": 5, + "3,5": 6, + "3,7": 6, + "3,8": 6, + "3,9": 6, + "3,15": 3, "4,10": 0, "4,12": 0, "4,13": 0 @@ -904,7 +924,7 @@ "2,5,2,4", "1,1,3,1", "1,3,3,1", - "1,9,1,6" + "1,16,3,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -996,7 +1016,7 @@ "CustomNames": [ { "Name": "项目菜单", - "Formula": "项目标题!$O$4" + "Formula": "项目标题!$O$2" }, { "Name": "项目首页导航栏", @@ -1007,4 +1027,4 @@ "Formula": "项目标题!$F$2" } ] -}//0opHN4POiHCdykBIZmikZa8CVKaeTC1sOjCq+EEixxrZ0E1dghYg7v8AbdZQd+6n/cdeR6n5DroUe9KXOX1JZjfKep0FoOzVI0CsPynefya7OvPXXvGaK60A1I9xJPWMCyGFfq86I679RsfXHfjCGcwplMPbOl+qklqoe4/Je+KPmvIdJXsHBuAebWhfbz+YIMI8w7OJYBS7IuHRhsy0tvXkiwPrphKsOW0QQi1FDEyGvXXriuZjHCB4lrjzyiHtyx83Fm3Tp5LqDZ5jpq4j3/kIvhDkyUDi6NIeADQ1WhgPNJTJ2TYeBC8OOg55M/RQcgKr81Ga50I6YPY3MLRMtPNI2mKbr9xnW60e1KE6dF9qWCqFuSxuMkBj7IH8H3oN5nTVBpaRBlAWLyjLm6FBa35pt1vWM5l+YbfrFqHlq/AfsMebY06BeeUDHasQoTFnC14ODkzOfuEdOR4SVAOIiiLcMcmHB1B7IFzVyfG9HyemrhZpuf/DZbe8WY+Cb/HORlgA7ZemcapNeCl6+LskOv7MM6YkELHNz7bZfFJOO0XkOkCRKQpA9/ER5z9J3wsX7aEp2gOljTG3iMH+1fnFzNaJCchRI4G2NR6NvCNh5fH0rEcH9d2M7CDJ34zwkF85EH7yKobqYAw9jI05v/HKaiZFhc0FEntoQTB9T4kUyDXLQnRUATCn9QS2S9qlFmrdqN0y5VWUe4HWaZEF9mTOZ/EzbtFMPXNuc7m+wbSh0HnhNtP/UhHio4aGunkldnpgXvG5FGvzabVs8xBhef/90qwjHIeQviJlJtiLUORG7kpUD2u5wcxFPyvphP/ZJz6wMYmjvU86T1bRJHfak30WXKLXieoeWA9EFpZfR1ABjbcO4oVnfLWKRqpkd20ATCq6lVrwAEeHgB5YqBuFag/urw==|920 \ No newline at end of file +}//5Wn4OkCfQjErmR6+k6UPmQwq8N+K8fW5ICFQEdr8LKeRbaROKdl8nh/RlAR8LUs19Qta3EIT/IcaYdGN/IIj/GOZ3LyA8vXBqCUsj0Ofhbk7HvElXB2fRRm+OVfvxFwQPQUsUQeHwKDZR3a/Q9g1sz8y5caQzDR84/yomiHWQUuIJsyLZwd3u9G2kxBPU/5oa+SHXZO2UnotQFC42qd+fnpuIj1rn44RzC0zIwSmf82nqSBZ0iZ6SDB4b1OcSujw40Fv7qRCMa5Fy0TMqXcD/9zV4cqWfoxOQfwjlwJ0E+xMWXngdLPD3Gwx32r4m8ePdWD4PYJnpqdwZugYLhxQvRP30YFPUE7plfvJLnFE9q16XTHTFJYgVzSbupeiXCNdyo3U8k21aLJDtrrFYeGSa1t0Sv2vakYVMgEe8Jz3XA/zrrAS8Z1EFovn0GyCOVgM7bTRnuwhFCvM+fNUXpsSHvPS7TYbEnoptVm7S2adNgmUZC3yQwnUf5NaEUo0FvlKUW7HwiautoOhrCHe2haCidaISUURXixW+QGC66JmOu7buxy1iqZazZiwA3iqv5nSYvr2WXcszTxLYnpD0+EfgDeosRjT8y3pFMpWrOiP0URYfOKMBl5NT8i9pY26Bn1sasiKrfjvTaKs6kAHUSccn41EfjYfmOstszu8/GD5hUCn/GwZtxiwPoY6EVyQoS1YefbXitYTuQOkAVaftsaADFNR4mxocOtblN1gIEOtWT1M1Z418tl0KlJtEYULzdXy7+zvLXwGhkw+vMFHtpI58OtXa+jLX4MK5IUTVArjJXoWTdG6mDsxl9sjE7MbwXs9U7caF5n92wnHUA76OYFYzQMLYFm3E8gBuBNXQG8CVDgOdxYDBjiGpgJZxOp50crbnwhAry55HJcjhgi5qATsqQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.rd b/Pages/项目/项目首页/项目标题.rd index 651c7320..52b7eecb 100644 --- a/Pages/项目/项目首页/项目标题.rd +++ b/Pages/项目/项目首页/项目标题.rd @@ -1,11 +1,11 @@ { "PageType": 0, - "ColumnCount": 16, + "ColumnCount": 18, "RowCount": 6, "CustomNames": [ { "Name": "项目菜单", - "Formula": "项目标题!$O$4" + "Formula": "项目标题!$O$2" }, { "Name": "项目首页导航栏", diff --git a/Pages/项目/项目首页/项目配置/项目岗位详情.json b/Pages/项目/项目首页/项目配置/项目岗位详情.json index 0ac5cdc4..12df56a1 100644 --- a/Pages/项目/项目首页/项目配置/项目岗位详情.json +++ b/Pages/项目/项目首页/项目配置/项目岗位详情.json @@ -1,55 +1,60 @@ { "Rows": { "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 32.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 35.0 } }, - "4": { + "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 24.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 35.0 } }, - "7": { + "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 104.0 + "DesignLengthInPixel": 24.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 104.0 } }, "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0 } } }, - "Count": 10, + "Count": 12, "DefaultSize": 32.0 }, "Cols": { "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 46.0 + "DesignLengthInPixel": 32.0 } }, "1": { @@ -131,7 +136,7 @@ }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 32.0 } } }, @@ -139,17 +144,14 @@ "DefaultSize": 32.0 }, "Values": { - "0,1": "岗位名称", - "3,1": "默认时薪", - "6,1": "岗位描述", - "9,8": "删除", - "9,12": "保存" - }, - "Formulas": { - "9,12": "IF(岗位ID=\"\",\"新增\",\"更新\")" + "1,1": "岗位名称", + "4,1": "默认时薪", + "7,1": "岗位描述", + "10,8": "删除", + "10,12": "保存" }, "AttachInfos": { - "1,1": { + "2,1": { "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位名称", @@ -186,7 +188,7 @@ "IgnoreBlank": false } }, - "4,1": { + "5,1": { "BindingInfo": { "TableName": "项目岗位", "ColumnName": "默认时薪", @@ -218,7 +220,7 @@ "InputMessage": "如果任务没有设置时薪，则采用此处设置的时薪来计算收益" } }, - "7,1": { + "8,1": { "BindingInfo": { "TableName": "项目岗位", "ColumnName": "岗位描述", @@ -252,7 +254,7 @@ }, "DataValidationInfo": {} }, - "9,8": { + "10,8": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -311,7 +313,7 @@ } } ], - "ID": "a4aaef0b-3aea-45fc-8efd-fa75cefa1c9a" + "ID": "33db34e6-1225-4518-ae49-9e6c860016e5" }, { "CommandList": [ @@ -326,7 +328,7 @@ "BtnText": "知道了" } ], - "ID": "60af6833-39a4-443c-8f67-4e8914a89f42" + "ID": "61e5384b-481a-4d42-aa1f-c4ca5a67214d" } ] } @@ -338,7 +340,7 @@ "e9b3c744-c9ba-49f5-b8c5-05c7118d2859" ] }, - "9,12": { + "10,12": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -397,7 +399,7 @@ ] } ], - "ID": "9ac7f641-d3ac-4498-8911-22c426092969" + "ID": "d61c0fad-8849-4700-a10d-b4945f02b5d3" }, { "CommandList": [ @@ -407,7 +409,7 @@ "ShowConfirm": false } ], - "ID": "8b0f0863-3ef8-42c2-9d7c-c9139cba58cd" + "ID": "52034a1c-77b8-4ee8-92f0-7cf812fc4001" } ] }, @@ -421,7 +423,7 @@ "Message": "操作成功" } ], - "ID": "088d1ad0-b685-47b8-a019-e977d12818b7" + "ID": "6373e5c3-8888-4d09-b49d-70ab9d7f2281" }, { "CommandList": [ @@ -431,7 +433,7 @@ "Message": "请指定项目" } ], - "ID": "8e610d3b-cb98-4861-a1f7-388d0bdef9bc" + "ID": "040bfe3f-59af-468a-90b9-892df04eb101" } ] } @@ -477,29 +479,16 @@ ] }, "CellStyles": { - "0,1": 0, - "0,2": 1, - "0,3": 1, - "0,4": 1, - "0,5": 1, - "0,6": 1, - "0,7": 1, - "0,8": 1, - "1,1": 1, + "1,1": 0, + "1,2": 1, + "1,3": 1, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 1, "2,1": 1, - "2,2": 1, - "2,3": 1, - "2,4": 1, - "2,5": 1, - "2,6": 1, - "2,7": 1, - "2,8": 1, - "2,11": 2, - "2,12": 2, - "2,13": 2, - "2,14": 2, - "3,0": 1, - "3,1": 0, + "3,1": 1, "3,2": 1, "3,3": 1, "3,4": 1, @@ -507,34 +496,31 @@ "3,6": 1, "3,7": 1, "3,8": 1, - "3,9": 1, - "3,10": 1, - "3,11": 1, - "3,12": 1, - "3,13": 1, - "3,14": 1, - "3,15": 1, + "3,11": 2, + "3,12": 2, + "3,13": 2, + "3,14": 2, "4,0": 1, - "4,1": 1, + "4,1": 0, + "4,2": 1, + "4,3": 1, + "4,4": 1, + "4,5": 1, + "4,6": 1, + "4,7": 1, + "4,8": 1, + "4,9": 1, + "4,10": 1, + "4,11": 1, + "4,12": 1, + "4,13": 1, + "4,14": 1, "4,15": 1, "5,0": 1, "5,1": 1, - "5,2": 1, - "5,3": 1, - "5,4": 1, - "5,5": 1, - "5,6": 1, - "5,7": 1, - "5,8": 1, - "5,9": 1, - "5,10": 1, - "5,11": 2, - "5,12": 2, - "5,13": 2, - "5,14": 2, "5,15": 1, "6,0": 1, - "6,1": 0, + "6,1": 1, "6,2": 1, "6,3": 1, "6,4": 1, @@ -544,21 +530,44 @@ "6,8": 1, "6,9": 1, "6,10": 1, - "6,11": 1, - "6,12": 1, - "6,13": 1, - "6,14": 1, + "6,11": 2, + "6,12": 2, + "6,13": 2, + "6,14": 2, "6,15": 1, "7,0": 1, - "7,1": 1, + "7,1": 0, + "7,2": 1, + "7,3": 1, + "7,4": 1, + "7,5": 1, + "7,6": 1, + "7,7": 1, + "7,8": 1, + "7,9": 1, + "7,10": 1, + "7,11": 1, + "7,12": 1, + "7,13": 1, + "7,14": 1, "7,15": 1, - "9,1": 3, - "9,8": 4, - "9,9": 1, - "9,10": 1, - "9,12": 4, - "9,13": 1, - "9,14": 1 + "8,0": 1, + "8,1": 1, + "8,15": 1, + "10,1": 3, + "10,8": 4, + "10,9": 1, + "10,10": 1, + "10,12": 4, + "10,13": 1, + "10,14": 1, + "11,1": 3, + "11,8": 4, + "11,9": 4, + "11,10": 4, + "11,12": 4, + "11,13": 4, + "11,14": 4 }, "SheetStyle": { "FontFamily": 0, @@ -566,11 +575,11 @@ } }, "Spans": [ - "9,12,1,3", - "1,1,1,14", - "4,1,1,14", - "9,8,1,3", - "7,1,1,14" + "10,12,1,3", + "2,1,1,14", + "5,1,1,14", + "10,8,1,3", + "8,1,1,14" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -616,4 +625,4 @@ "PaperSize": {}, "Margin": {} } -}//w0r513Y/cHUjkQ2xpensyviDOXSCByZXSHDb5EDeUsJQwJk5onz6LW9Z1FfB5krRm0BNmUFieJdvSieXC4sOcs+TfGFnAhKeQRN3LhNehQykTzfJ+TS0zXsvQ93p9042AzaCHmsyZPoQZUDu3wvJc9rYtgq1kFc1FYbkXyNFDsUKgY901nNFFSqVYTpgxUk7jdgJ+xzdFnAKn2qFZ2E0ObRK5cX9EMnum2csOx9aHrzDFG+w3pRuoAOSUQorqvcY83+n/Jk/Z2wfaEQsjEwddx2xC15lVBy9d9r2cuRAGk2nJ9hRQEN1eyn0zhjJI965oMCm/vCQGeSmiMjDeWJF73ec114EiEs9cGNKlfvsvLRlCzF+BweuI7AJYXuRs37U55lRh4XmjF0c4+i5yEcD63WLGFdGYoaIbwD8mCVc2K4IADIDehD+A63enimIP1GkfBPTrtT4sx858f68Ut5KrP4yRK25p6zdlAY6kAIZGZyNcqsDo7FswQPpzWFNtbBl1Utxx/JIbwGSUEdITLGFM4aOBz99jLcnne5hjZLtAf/N7AR55zBUhv1DM9yHLWkflb4RhnovsN4nctdi7TnUaP1f77rQ6S5cAcy7KyGMOMHhxAzIGdM9Pl2rdbrCdt7A1M4uC816cSpS9xduWrvjlL4/mvDmSrPKgMsWEfoK1XJH49n4QMepLg/I4hHgEi58Q0o193lHwNpTO5AIsSAkPzyq5QJG/pdDAVDLGeL2AHH7Y+/PhfY3TgsH5zlhA7BerKWwdVCPY5a9scOudT7D4V+V56b7/CCC9pzvp0PbuCILiEu6+9Aaa8crHZYl8Tzzh0FLLvxEzoL7Wzjtp6bleoIcNUm6xku0ERpwaau0/0CF3T37Jp/sKJvwfJZw3TeFahEsEAkep9pO+dESLIlM9g==|920 \ No newline at end of file +}//lhJN5sv+83YemmFuY1pT3+n2g/IFhyGU1tE8YBp/X+QesjssUrLehVSLJW4QmhoRMHXxJkJBsW01hXHAN0vo+LtHeZ0rvJ6zmGfDI4Q+h9hHkFGp187zINWt2Pj9nAuwguSIzw8yyFYmCGvKN0J9YV7aeVdaLMSIPeQmp3C9uxBOZFG/9mvogtB0a/MMwjBIif4PYcMT4PnHTzZK+J1IB5SsqQJwzynVmNrBLh9KgSwAIHnW6zMTu9X6FKC9C91wrqHqKhvt5K06uS4oAK9SikDKQRXG35Qlf3ZwE6hx9VTeBH2qeL4bWiInxKstDWbE8YdoosiCPj9nyiW9xcZjH/j1fvwHL5AOwSyhy0U/Ugf8/3qCFF35fXN3Jh0zVEdzvr17sLOuDAtN0Z8dmTXG36MlfBc5+WzuNtGS3d3AtkyJzAkAIv3/vXT35XaZ7uYXm7U6ifsjhgTett1duJihLPmFcqqf+7/GVVIpgwRFeog77UxIJ0O56nYQifvGmk8FEZXzUcF/yye3K8Jt6N/BoxZKJuZoVzjOT7w0/c+xzZz4BDeNBFG3buVw3z+ahUGEODj4kpZYai33O+XDf2DhncDuhrDoQyDuaSbCg8LyP+f0pgNXTTsj60ZZo4Ju0wcDppUMdb8bqRc4DLv4KNPvjnQwjgGEtwv/lEVmonpmyYTmuBJJcBOOTrHCgdKYe3OaW/jHSdqtbKQXX22OzD9NHg2xnV3P8JZM0YwAyXnVHsaKZQ8TAU3zfPNKIx/Wd/SR/FO5VYYlz3Z0oHinFE+hP3tgo6vrAnImU8p6lHXflsBCL1RYvAN57qTIMo3mgsBklMZ4iVkG1oFWVgd+X0sha1gNiQ3HDTaeiobgVa508qQn3FxJzYRP8F3FbIbTyeolJ5zspI13p9962ZMTtG3uxA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目岗位详情.rd b/Pages/项目/项目首页/项目配置/项目岗位详情.rd index 6a6ae716..585eafe7 100644 --- a/Pages/项目/项目首页/项目配置/项目岗位详情.rd +++ b/Pages/项目/项目首页/项目配置/项目岗位详情.rd @@ -1,8 +1,5 @@ { "PageType": 0, "ColumnCount": 16, - "RowCount": 10, - "Formulas": { - "9,12": "IF(岗位ID=\"\",\"新增\",\"更新\")" - } + "RowCount": 12 } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index a7eabe18..41c242d5 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -495,7 +495,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "e64b8127-5f6c-4e67-87e5-ee8e787e6094" + "ID": "5ccb9ccc-4529-4c6a-a0e2-8687f8ac08ed" }, { "Condition": { @@ -529,18 +529,18 @@ ] } ], - "ID": "0d054834-c864-44a5-9498-75ad33883725" + "ID": "5c4bfd77-8023-411c-8d1e-7434178e25ab" }, { "CommandList": [ { - "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", - "ProcessDefinitionResourceName": "新增任务流程", - "ProcessInstanceName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"项目[\"&任务列表!项目名称&\"]的新任务等待创建\"" - }, - "ReturnResultName": "发起流程结果" + "$type": "Notiflix_Forguncy.Confirm_Command, Notiflix_Forguncy", + "Title": "提示", + "Message": "确认要发起一个新的流程吗？", + "Answer": "我已确认", + "OklButton": "确认", + "CancelButton": "取消", + "Result": "按钮结果" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -552,14 +552,22 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=发起流程结果.ID" + "SerializeProperty": "=按钮结果" } ] }, - "value": "%Null%", - "compareType": 1 + "value": "确认" }, "CommandList": [ + { + "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", + "ProcessDefinitionResourceName": "新增任务流程", + "ProcessInstanceName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"项目[\"&任务列表!项目名称&\"]的新任务等待创建\"" + }, + "ReturnResultName": "发起流程结果" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -570,19 +578,154 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=发起流程结果.TaskExists" + "SerializeProperty": "=发起流程结果.ID" } ] }, - "value": "1" + "value": "%Null%", + "compareType": 1 }, "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!临时存储发起的流程ID" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!发起流程结果.ID" + } + } + ] + }, { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "PopupDisplayMode": 4, "ShowDrawerHeader": true, "ClosePopupCallbackCommand": { "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "搜索任务", + "TableValue": { + "TableName": "任务表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "流程实例ID", + "GUID": "cf657190-e827-46f1-a2d0-aa553276a9b6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!临时存储发起的流程ID" + } + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "4c6ffe0f042d4c6ba134cf962f493982" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=搜索任务" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "删除指定流程", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "流程实例ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!临时存储发起的流程ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!项目子页面" + }, + "Value": "%Null%" + } + ] + }, + { + "$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": "=\"以为您删除刚才创建的流程\"" + } + } + ], + "ID": "55d9cac8-780e-4bf1-8fa5-20f51ec49c12" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"删除流程失败，请手动前往我的待办，处理刚刚发起的流程，原因：\"&任务列表!msg" + } + } + ], + "ID": "65600ab6-7ccb-4634-87d1-b4c56e8d64a9" + } + ] + } + ], + "ID": "63b97945-1ce4-416c-99c5-a355398658a5" + } + ] + }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { @@ -620,32 +763,32 @@ "LoadBindingDataOption": 2 } ], - "ID": "d5debc27-bbc0-413a-8c83-f974ff50029f" + "ID": "915bbaf3-61a0-4005-b2ad-0a3dccfb1e80" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!发起流程结果.ErrorMessage" + }, + "BtnText": "知道了" + } + ], + "ID": "5eb7d3da-06fa-4493-90fb-37bc1d1679ac" } ] } ], - "ID": "33855eb8-0073-41c3-a19a-e7a81e19e97b" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!发起流程结果.ErrorMessage" - }, - "BtnText": "知道了" - } - ], - "ID": "31c264f2-33d5-4ab9-861c-57162db4a976" + "ID": "730d3490-09c7-4e2d-b8b5-c87a95dad068" } ] } ], - "ID": "8bb5f23b-5dc9-48b4-b72b-4d79828a46a6" + "ID": "e00d60a1-83e5-48cd-a695-d710cdbbba25" } ] } @@ -1517,7 +1660,8 @@ "1,34,1,3", "1,9,1,8", "5,10,5,28", - "12,1,1,5" + "12,1,1,5", + "12,8,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1643,6 +1787,10 @@ { "Name": "任务EL表格", "Formula": "任务列表!$K$6" + }, + { + "Name": "临时存储发起的流程ID", + "Formula": "任务列表!$I$13" } ] -}//Ae7RwdSkR/4esqFYSwyS/x/qGzU/eXdI8myAffo/KRVfE8kWYlwYoRo4etmQlvex8kcPnTEM2lvO7H+PEEjnBETkmQEE5jA/x8QstWqrDtzYOZiSEqxBmWe6IW8TSZCA7GKZgcWEeSAOj/Zpl3umKXWZmNK6+XMSX8tavRgR+u/AYHkqbJNvrAlSxk14k2WxIRnZUDkcGRiCMBDwJBrKudO2k5T3uIBM2zY63wxQ+bEvHXpbrcpnM1ZvCdeTus0zyGfpVwlD44sGqjcuW+eugG2evrlAXsziTGl3H8sp6xZ2NQVYj790VKBPdtzdcsA/vXJRTVcFwGz0RUXBhH3yHVYclQ0E8Zs2AB55jumIYU27myk4+ApKKOsHhGQO/xT3fLUTo44xYx8RDkVhw5AP4Tn1HrV4c+k4Pcw26M+Hu6sRp88m3a52TDqrAjWP62tD2RWDNlLhLTIhhbaX9g4noUvCvdYf8w0AAFsqTEgIS9exjpcKws/FldYQYDyjYL0kvj8se/M2ejlNBv/Clo55A7oHyHNU4JX7GfVqrl/eyjCcL60IBNdmmOhpYhsCV3nUgSWphsGa7/JnXf8x7dbBItjiYe49AF7rh2mvQUcLr+b7YFiHqvRt5LpgiDoZd0owl0e7ZO7aB37dRJ4UrdcwFCbFam2OAeejUhuW5R07+0m359DXob43KOxjjt5mKA2W5HBYrhi9dX5RZ87Ul2z5kvXd+RuscKeqT59rLO78nVXPQdxrzE1HzCCqdbQVVhStPs4ywe9rmsevSA2/I1XFHTMzq5HqGry0Z5OGdRHQ7XIXt4wnT7iYsr4m7Nnes0ezVeI6VHyZEqupMZKsR43UPg8FYS9Pj2hwJT1OKC0tIa1ZtoL2m8XJmUOomhqX2cVjKYKDZwHwOCXBdiDJPsKdRw==|920 \ No newline at end of file +}//7Z98gC/K7YY98X7Fsq+oHFXwCnckRKwih773fLEhnuuBYIQCroP1V3R7rcpoMxf3Ww609n0Sbz9rhhLILRPewCe/ehnFdSPRZsJN6o1YSRRlKhF4bxW0avMFyxKh1Vzx5aCLP2sd6bq7QKAR1yY1lfqR7YyecdwHnD4R3M0gtWahrKewNeYdpYpFofsgP0PxySmsnnoi+POyJP6Bcm2pTWxdrfpa17RJPIluynLesdNrRckiYK9Fp+aXvAfk6evJc8bm66CnUti4YU9LsyK+QNXFU23wAAP+TocRtztWoPoJ+RmJ3llWgChQGMMhqmEW4Z/fDFIEhRcwAbrKjUsrRQ+8j4KUwD2qbATFKKkT0iRCtMjd8+o7SiSl/Yykh0Nj8IKLz+to0UOgIsyLVh3l/v6Krn12lu3NeDL6YquV1ICkHYQjvrwzHlGblc6blJAlapoUlXlyMDOnzzK9j+ieQv92UBZLaEcRAHBBXzZjBMsSfHdAXHl7mU3LdcGdOK8LOhyxXHehXKz+qfO8RCZQuODrf4lw88issGxvQE7zCd1Bok++ZsxlaOCIrBtdzw2llr/yfbQ2da8AY+IxHUfMs5bEcEeO/eRT4Cld1jxxC3uXgRId274JqYhimeWK7CFf0gWivpMf1Ap+aQSjoWOotqWB+CZd1dj5v2dfUbMzHco15lBn3iOyg0gtenQYOmnqedTSfhaMafCJCWWJfzZ5mDcZRt9x8EQLN44e5jO3Z1j3QGlxLXp4yRAwCcHpLiCy2tyVdwCSap+9M5o6EAVyK5aB7ayV3Y8kuAb79H5QvXMj5V7ClOLrqO86N1Cg20+7PXSRl4L9ZwBIN3tBZona+tKe0Zrh1SKz9j7wiP0kX3IdKfbyzAMgMtvbu1cS7OT6QSyffVkq9A7cemhw01p5Pg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd b/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd index 084a5eda..b080f689 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd @@ -14,6 +14,10 @@ { "Name": "任务EL表格", "Formula": "任务列表!$K$6" + }, + { + "Name": "临时存储发起的流程ID", + "Formula": "任务列表!$I$13" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json index f74c86a8..1da1f6aa 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json @@ -771,7 +771,8 @@ } ], "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, "ColumnBindingInfo": { "TableName": "项目成员表", "ColumnName": "岗位ID", @@ -1050,4 +1051,4 @@ "Formula": "项目成员!$B$7" } ] -}//aLI850jNIB3GJZ9YwEq5aONoMUS0uCDFy9HDriI2U3RD7PxjlcTrQ++3VoRMP4aSPhIEHTc9FWOEZSa6mbMFT8UBUqh+WpiYRva9EoMq3NBzlG70zbgIAnYOgAQvpAUnX38oRdgnhVkhYGWWzUKQENu+SvF6FP0HxZjAKhjnWdw1/6OFfJ3s5J/YCDwo4HkwY1C5Wi91DVVrdqqdR34YxnWQtthMMHxuhMMF5KTaGrgiOMgWkl7j4XZoq/CdzzEmqDRuWKY4MzDv5cOz1EuZirtdAebBQgcKcE3MpLgLcyXPd10rzbRj1GyOjXxjNwdA7gRoKfMSQl2ijJs7LOh61H7LPqgt/GLaqgFRiJS5VCkDa+pkXsNJq2J2wjhKv0WA01vjcjYtWg1rSUBE3IMCwzrzVStGHABpsyF7Zo4KK4u+GilXwzCbrDifq3IO1DHErJUCIie2f7P2NMSSOEFm7uzki0XOvtrPfJ0M6M75JStnwcATMj1/SX8icCA+6d1JP9w4k1jrBn0E46qfubd+UvMYY2KVVNEov8JCn8duXhO7/k0yhAF0wVe/4ppr1mw96LODdRh1FuUWaGpXAP0py9PSFSX3FjZgbGyQw7UlhojGNJKlQkor8cXg8OgN/VkjZeFFoaZzdCcJJh6mnXcqABNvFg3FGTkTVpiaISSiF9kFLwG3E2k2Ei08uMjBpJKafdu1Wv9r1wiE18+PwIolxBPp1oNQhqyd8rilpK5EoAbhy+6mkwfzTd648PdX+ncL7Uy1Q+HmazamSBZ1zUyJv0OsseanJD+6G4bhSmrTm7RsYq60/llT9d+NLj/AwEeH0vs+Qcl/KiECgsy9Sj9SDkMTS9avLexNj1bdy7Eh7oLz+eT9DVFUabI/JD2Bqzn2a5c305oXUzEe4LDMQMVvzA==|920 \ No newline at end of file +}//w3IfLixcU0EnRZeKTcmB4JVOu+tuFnG7WS6Z1hx3QKWvMi0eqby+brNZ/W3ze7LkO2zIJWr5fbbgm4qp1vMGJ9oXdlKkbPE2h1Mtv/6/lg+TD6SK+daybMwMUu6438wMdr2K58Lwj/zsj0dOcJMjndiyLgqk1kiSPyQXlLixpjHFJpLf2OeeDRD8jqpwn5HpIad78g3lyeWuHCb7EZyFmxhvkKGFZ5fKcJBYMQs+vG1ZOjtA4j7p8A8vCmYSj7DuwRwSFSckQjoVfgka45rFLqxWgKv/NAV4Xyjgb6/8kq8gGAJL/ZPGawq3kc+obV9Fr8F4fkQVDJCRMCMiWheK2tiKzIY7lo4BNzwZhEszKRTXMRSmd8gNmr6NZk/aZUQDJG3+dpqh/0dC23w/Eh07TfpeOsCQIMOurWXOgWJoo3jyiuLK4bEUAVXa93+rneFltyACojcE166OELJ5C61ngyg/s3iS+dmUVgbRZEpUfLGzcwKieGWWOZXdXgwykKMKBxxrCzMciO2s1jUflK+Ct9Lh4YwG2o4XRkSlcqFRhOF6uqe05Gg+oeuENNrYZV1irVyvwYJ2Y3KFunn3aVXD1QrJbY+4OtOsWspBAOV9JbjxQtD6eoQ4nSxEyl6sRIMaupjTTQ4gP6ys5GAjeC/5fk5KquvhSt7jtHSm7OQ+bsRBKAtKWVE4Kp/eDcdAkceWfnYx4BMnqokODJpqfRf/LkX1R3cBD4LFS09mxbQ7uQl9a7uXNBVFNnuq+zJat0bvqejiTdRSxTp/c49qlD+0u5OUtMdjC+W6VFezA9iQFIytZ7ajoOzkDlzEFXdfdR0B6cM+aaAnWEhGxgDIZtq20wzFpeUFER0tNkAWOUDzCMTflo7IGlracDZZ3NyjkXwm01tL0SY1WEvjV2oLQrGXdQ==|920 \ No newline at end of file diff --git a/Process/新增任务流程.bpmn b/Process/新增任务流程.bpmn index c57f6d46..e511415c 100644 --- a/Process/新增任务流程.bpmn +++ b/Process/新增任务流程.bpmn @@ -4,7 +4,7 @@ - + @@ -14,14 +14,14 @@ - + _4f4ab1b2-ce52-46c6-bcc8-52c43b0c4a9f Flow_0otbu5x - + Flow_0otbu5x Flow_1bfvbmv diff --git a/Process/项目立项流程.bpmn b/Process/项目立项流程.bpmn index 71aa15fc..e4a9b8f2 100644 --- a/Process/项目立项流程.bpmn +++ b/Process/项目立项流程.bpmn @@ -4,7 +4,7 @@ 用于项目的立项申请审批 - + @@ -40,7 +40,7 @@ - + Flow_1m23z42 Flow_0cq5pfu diff --git a/ServerCommands/任务/递归删除任务.json b/ServerCommands/任务/递归删除任务.json index cb2e9add..579bc167 100644 --- a/ServerCommands/任务/递归删除任务.json +++ b/ServerCommands/任务/递归删除任务.json @@ -28,7 +28,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "9d88d3c1-4643-4d96-8f33-49512561ee79", + "GUID": "ab0b3107-6f6f-443f-850b-10f93cfefe1a", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "流程实例ID", @@ -37,7 +37,7 @@ "ColumnName": "流程实例ID" }, { - "GUID": "f4c3fd5d-6d03-4d40-9a73-27b548486406", + "GUID": "76925871-b928-493c-a6f1-b2d1ebdcd078", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "流程实例ID", @@ -51,7 +51,7 @@ "ColumnName": "结束时间" }, { - "GUID": "bcf02a5e-e6f8-4407-b818-cc1a08471df8", + "GUID": "fb2debed-e617-479e-8e45-47c7276ed383", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "实际工时", @@ -60,7 +60,7 @@ "ColumnName": "实际工时" }, { - "GUID": "6888a3d5-f8df-4466-a550-9a383f3cc7ab", + "GUID": "09eef33e-b2ac-4ed3-bbf8-a6066bd027a7", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -71,7 +71,7 @@ ], "TopCount": "1" }, - "ID": "a2c6055383914bd1b0a5490b85f75bbb" + "ID": "622de484f4b14c3b96374587bbe83e67" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -106,53 +106,6 @@ "value": "0" }, "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": "=任务.流程实例ID" - } - }, - "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.ProcessInstanceCommand, ServerDesignerCommon", - "ProcessInstanceId": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务.流程实例ID" - }, - "OperateType": 301 - } - ], - "ID": "b9d47ec8-473f-4233-ba47-f78b1260e6c7" - } - ] - }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", "CommandList": [ @@ -235,74 +188,74 @@ "SerializeProperty": "=ID" } } - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "子任务列表", - "TableValue": { + } + ] + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "子任务列表", + "TableValue": { + "TableName": "任务表", + "BindingInfos": [ + { + "GUID": "f23e208f-c4ed-4aac-a039-96e410ba7c17", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "e2484615-328c-427a-9f51-82990fe8c1c7" + }, + "ColumnName": "ID" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { "TableName": "任务表", - "BindingInfos": [ - { - "GUID": "39fa2481-638c-4b3e-a20a-5a4fdddc8f1a", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "e2484615-328c-427a-9f51-82990fe8c1c7" - }, - "ColumnName": "ID" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "父任务ID", - "GUID": "1b5ffdad-96a9-4758-aa3d-3df34e594df8" - }, + "ColumnName": "父任务ID", + "GUID": "1b5ffdad-96a9-4758-aa3d-3df34e594df8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "a94c7abbb5e1498d8a22ca152b067c3b" + }, + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=子任务列表" + }, + "LoopItemParamName": "Item" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "递归删除任务", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ID" + "SerializeProperty": "=Item.ID" } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "e7c6b702bcfd498a870d1da8f37c4e31" - }, - { - "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", - "LoopInfo": { - "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", - "LoopCount": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=子任务列表" - }, - "LoopItemParamName": "Item" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "递归删除任务", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.ID" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true } - ] + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true } ] }, @@ -312,7 +265,7 @@ "Message": "删除完成" } ], - "ID": "b4e10fe1-d71c-466b-931a-30392d392123" + "ID": "8c1f2073-1e8b-4dde-82a0-d6c599c2f852" }, { "CommandList": [ @@ -325,12 +278,12 @@ } } ], - "ID": "be2f819c-6542-46f8-bf77-5b519240feb6" + "ID": "a5fd3c9f-3ab5-4a15-a0de-25818784bd49" } ] } ], - "ID": "6992f9b7-07d3-4983-93fe-a5a476bcaff6" + "ID": "bbbc9006-bd53-47b4-b986-9eabca5a8d7f" }, { "CommandList": [ @@ -340,7 +293,7 @@ "Message": "任务不存在" } ], - "ID": "ab1a23fc-7497-4498-8521-d4f8b3509024" + "ID": "a9412af3-edcb-46c1-b751-dcf134a936c5" } ] } diff --git a/ServerCommands/系统/删除指定流程.json b/ServerCommands/系统/删除指定流程.json new file mode 100644 index 00000000..6804a7ba --- /dev/null +++ b/ServerCommands/系统/删除指定流程.json @@ -0,0 +1,48 @@ +{ + "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": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.ProcessInstanceCommand, ServerDesignerCommon", + "ProcessInstanceId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=流程实例ID" + }, + "OperateType": 301 + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "流程删除成功！" + } + ] +} \ No newline at end of file