{"Message":"1. 删除工时核定方式字段,及全局使用;\r\n2. 全局修改思路,按实际工时计算收益,计划工时只用于校验实际工时是否超标;\r\n3. 增加“工时分配方式”字段,用于扩展不同的计划工时分配方案","MessageType":2,"Modules":[{"State":1,"Type":23,"Name":"TableView/子任务视图"},{"State":1,"Type":23,"Name":"TableView/View_任务工时统计"},{"State":1,"Type":23,"Name":"TableView/人员工时统计视图"},{"State":1,"Type":23,"Name":"TableView/View_项目统计信息"},{"State":1,"Type":7,"Name":"Table/项目表"},{"State":1,"Type":7,"Name":"Table/项目预算变动表"},{"State":1,"Type":1,"Name":"PCPage/新增报工"},{"State":1,"Type":1,"Name":"PCPage/任务-基本信息"},{"State":1,"Type":1,"Name":"PCPage/项目工时"},{"State":1,"Type":1,"Name":"PCPage/项目信息"},{"State":1,"Type":1,"Name":"PCPage/项目审批"},{"State":1,"Type":1,"Name":"PCPage/项目标题"},{"State":1,"Type":15,"Name":"ServerCommand/新增任务"},{"State":1,"Type":15,"Name":"ServerCommand/新增工时"},{"State":1,"Type":1,"Name":"PCPage/项目成员"},{"State":1,"Type":15,"Name":"ServerCommand/修改任务预算工时"},{"State":1,"Type":15,"Name":"ServerCommand/新增或修改项目"},{"State":1,"Type":18,"Name":"RdlReport/工时报表"},{"State":1,"Type":1,"Name":"PCPage/收益中心-收益明细"},{"State":1,"Type":1,"Name":"PCPage/提交结算申请单"},{"State":1,"Type":1,"Name":"PCPage/审批结算申请单"},{"State":3,"Type":1,"Name":"PCPage/项目预算申请历史"},{"State":3,"Type":7,"Name":"Table/工时分配方式"}],"Version":"v1"}

This commit is contained in:
SHAMUSPC\NINGMEI
2024-03-30 17:05:32 +08:00
parent c9093a1ce4
commit eeca27cd77
28 changed files with 1589 additions and 1279 deletions

View File

@@ -87,7 +87,7 @@
},
"TopCount": "1"
},
"ID": "96d547bb2a2a49d7a8c7dc2c2df503c5"
"ID": "e249fcc1e8314d89994ed379114805fb"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -126,14 +126,6 @@
},
"ColumnName": "严格模式"
},
{
"BindingInfo": {
"TableName": "View_项目统计信息",
"ColumnName": "工时核定方式",
"GUID": "ec3b7b01-920d-4ad5-9a6b-6360afbada2a"
},
"ColumnName": "工时核定方式"
},
{
"BindingInfo": {
"TableName": "View_项目统计信息",
@@ -145,10 +137,10 @@
{
"BindingInfo": {
"TableName": "View_项目统计信息",
"ColumnName": "总核定工时",
"GUID": "7c0f01a0-76c6-4b67-85f4-4c0e4455503e"
"ColumnName": "已分配任务工时",
"GUID": "239a7f3e-877a-4045-ba12-838408b52584"
},
"ColumnName": "总核定工时"
"ColumnName": "已分配任务工时"
}
],
"SqlCondition": {
@@ -165,7 +157,7 @@
},
"TopCount": "1"
},
"ID": "bf2f70f520974b768143f5c166040550"
"ID": "66c3b6d4cc42478aaa57db9f14eade1e"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -203,7 +195,7 @@
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
"ParamObject": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=项目统计.总核定工时-任务表.任务预算工时+新预算工时"
"SerializeProperty": "=项目统计.已分配任务工时-任务表.任务预算工时+新预算工时"
}
},
"value": {
@@ -230,7 +222,7 @@
]
}
],
"ID": "e9f67ed4-f44a-4bd7-b04a-4b3d8ee43eff"
"ID": "af2bdf89-3fdf-4290-8925-631d21c797f4"
},
{
"CommandList": [
@@ -259,7 +251,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "任务预算工时",
"GUID": "340f9b02-8f8d-47f0-9111-01fd2d7f4357"
"GUID": "b78102b7-bcdb-4145-a54e-46accc090b40"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -279,18 +271,18 @@
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "项目ID",
"GUID": "b391f334-49fe-4abd-944a-382c49fa21d0"
"GUID": "3dfb20d5-c014-4d00-b1fd-f84951a03919"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=项目ID"
"SerializeProperty": "=任务表.项目ID"
}
},
{
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "项目动态",
"GUID": "fdbb3ead-fef4-4513-bb19-98b174e3a225"
"GUID": "f026ebd2-95a1-4077-8e6c-e883138826b1"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -301,7 +293,7 @@
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "执行人",
"GUID": "bc64b248-4605-441a-a2fe-02fffb13b8d6"
"GUID": "cd4d5d5b-62f7-4c11-916d-96c05c629d09"
},
"Value": "%CurrentUser%"
}
@@ -324,13 +316,13 @@
]
}
],
"ID": "4b6538ad-e137-43ed-a0bd-db5e924474df"
"ID": "192e31c3-338d-4f15-bb49-3911058b115c"
}
],
"Comments": "如果任务设置了预算工时,则检测是否超标"
}
],
"ID": "431d1fc4-4a40-414f-a32c-c06768da0400"
"ID": "b30b7611-008a-4ed6-a814-c397af4e5949"
},
{
"CommandList": [
@@ -349,7 +341,7 @@
]
}
],
"ID": "7828a711-c408-40ed-91a2-1035bd9e90f2"
"ID": "17e77015-583a-4534-b207-6b18b682b670"
}
]
}

View File

@@ -101,14 +101,6 @@
},
"ColumnName": "严格模式"
},
{
"BindingInfo": {
"TableName": "View_项目统计信息",
"ColumnName": "工时核定方式",
"GUID": "ec3b7b01-920d-4ad5-9a6b-6360afbada2a"
},
"ColumnName": "工时核定方式"
},
{
"BindingInfo": {
"TableName": "View_项目统计信息",
@@ -120,10 +112,10 @@
{
"BindingInfo": {
"TableName": "View_项目统计信息",
"ColumnName": "总核定工时",
"GUID": "7c0f01a0-76c6-4b67-85f4-4c0e4455503e"
"ColumnName": "已分配任务工时",
"GUID": "ec163591-391a-496f-b95b-2b30be766815"
},
"ColumnName": "总核定工时"
"ColumnName": "已分配任务工时"
}
],
"SqlCondition": {
@@ -140,7 +132,7 @@
},
"TopCount": "1"
},
"ID": "4068a409eade48e59173917d96d60bf8"
"ID": "89a933bed8a0415093c1ca7e65863c02"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -195,7 +187,7 @@
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
"ParamObject": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=项目统计.总核定工时+预算工时"
"SerializeProperty": "=项目统计.已分配任务工时+预算工时"
}
},
"value": {
@@ -213,7 +205,7 @@
"Message": "任务预算工时超标,请修改或申请新的预算。"
}
],
"ID": "53f4187a-3af5-4705-9047-e23ca8c51a4e"
"ID": "0ef03e16-c7dd-4129-8c52-1d722026d23d"
},
{
"CommandList": [
@@ -237,10 +229,10 @@
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "层级",
"ParameterValue": "1",
"ID": "fc1c177d0f8146fe971c98817bc9a68d"
"ID": "b16d29a07b0c438fbbb99f78efd15b82"
}
],
"ID": "8621eda5-c90a-4e21-bc4e-fe7f3cf5bb76"
"ID": "ce7fa14c-0e2c-42d3-a368-2f6f44c5e987"
},
{
"CommandList": [
@@ -283,10 +275,10 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=父任务.层级+1"
},
"ID": "578a03f2bc28443291e158813a67f853"
"ID": "94dddad10a1647e3906a84c6cf0793dc"
}
],
"ID": "608074a6-c246-4740-b2b9-22d68cbfa8d9"
"ID": "bf6e17fd-b30a-4bdb-9c1c-e61fd14f9a01"
}
]
},
@@ -303,7 +295,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "项目ID",
"GUID": "08af72b6-edaf-4d60-a5b9-9a416fa340e6"
"GUID": "d1ce9d9b-3111-45d3-86cb-9d2d13ca96a9"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -314,7 +306,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "父任务ID",
"GUID": "b67853cb-e11a-45e7-a157-a39f2ed30957"
"GUID": "663b0fd7-aeaf-45bd-9bd8-5081460bf68b"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -325,7 +317,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "任务名称",
"GUID": "ae0e9518-a034-41fc-915c-77240b405ea6"
"GUID": "8f65568f-c2bf-47dd-a801-33660d2d3b1e"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -336,7 +328,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "执行者",
"GUID": "c982c67a-6248-442a-a585-f64fe62d2680"
"GUID": "cd0b6e71-917b-4141-97fa-759aee7d60dc"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -347,7 +339,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "开始时间",
"GUID": "32733259-ed48-485c-855b-b773522f34b7"
"GUID": "3c7c2bda-50f9-428a-a444-c72e4ab3bba8"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -358,7 +350,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "结束时间",
"GUID": "190579b6-d2d8-4b11-a61c-84831351451e"
"GUID": "10d5a495-3443-43f1-814a-7b26b663a59b"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -369,7 +361,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "任务类型",
"GUID": "7814d8a0-4316-4e3d-a2fb-1419c4820881"
"GUID": "7182f12f-6e4a-456f-93dd-259034437aec"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -380,7 +372,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "分组ID",
"GUID": "de35ab3e-835d-4cc3-b8dc-fa36e5212b69"
"GUID": "30b21965-c8f2-446f-b463-fd5acbe18fad"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -391,7 +383,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "版本",
"GUID": "4e7e93dd-43ef-4a30-ac01-6884fb764d4e"
"GUID": "00196d28-a6a3-41b9-b4ff-96e22d2908d2"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -402,7 +394,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "任务说明",
"GUID": "60673be5-8743-4376-a620-0710929824eb"
"GUID": "b5c7d432-0b10-4fd8-a018-59dda1fa58bd"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -413,7 +405,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "备注",
"GUID": "e22df11a-00e2-43d3-b91f-709f94649021"
"GUID": "d16f82bf-c2b1-45e1-a6e7-09ec92385858"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -424,7 +416,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "层级",
"GUID": "4cd5444f-2718-4baf-aa2e-f9d6915f4e46"
"GUID": "85f9bb94-726b-45d3-a097-0e26e70a57db"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -435,7 +427,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "任务预算工时",
"GUID": "d3098515-dcd2-4140-9f49-4c1434e6f61c"
"GUID": "06ca0878-5d0b-4450-8d58-d0a598927853"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -446,7 +438,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "任务状态",
"GUID": "5dd1d998-9b31-437b-acf4-6f039fb1e101"
"GUID": "3f066ba2-b601-4a29-a83b-d0c77ac63dc7"
},
"Value": "0"
}
@@ -463,7 +455,7 @@
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "项目ID",
"GUID": "2e28aac6-1fb2-46fc-a19d-ab41520eead3"
"GUID": "10414937-35a4-4c78-88ee-573c87c57613"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -474,7 +466,7 @@
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "项目动态",
"GUID": "f8082e24-0691-48e8-a425-32659221befd"
"GUID": "78700379-81df-4091-a3c0-c0ce09788052"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -485,7 +477,7 @@
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "执行人",
"GUID": "b83be749-881b-42fc-ac00-1f4a7e4004fe"
"GUID": "2a010c61-4894-4c8f-9e2c-3a7d6c7eee3c"
},
"Value": "%CurrentUser%"
}
@@ -499,13 +491,13 @@
"Message": "新增成功"
}
],
"ID": "42ba3bd5-cbbe-4b9d-b1ad-4d3c7fddfbce"
"ID": "2ef12a32-79fb-4b9e-ba6e-a74cefdce479"
}
],
"Comments": "如果任务设置了预算工时,则检测是否超标"
}
],
"ID": "159e6b8d-e674-41dd-97a9-0722693f416f"
"ID": "0fa041e6-5103-463b-92c8-ef2f2941083e"
},
{
"CommandList": [
@@ -515,7 +507,7 @@
"Message": "项目不存在"
}
],
"ID": "9de2f0ca-80c4-4f6c-a3c9-772972beef5c"
"ID": "1c761c3d-7b1d-4638-bc2d-8b4942004cf9"
}
]
}