{"Message":"修改工时上报逻辑","MessageType":2,"Modules":[{"State":1,"Type":23,"Name":"TableView/View_任务工时统计"},{"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":1,"Name":"PCPage/项目分组详情"}],"Version":"v1"}
This commit is contained in:
SHAMUSPC\NINGMEI
@@ -508,7 +508,7 @@
|
||||
"ID": "76e6b1beb86d4cffa86d99da1b1b8d56"
|
||||
}
|
||||
],
|
||||
"ID": "4fa65951-a296-4051-9a8b-32358ea17112"
|
||||
"ID": "5892bb26-315d-4713-b965-a9c3a0c5aaf5"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
@@ -540,7 +540,7 @@
|
||||
"ID": "14e4ee83f2994475987fffe9fb3f8315"
|
||||
}
|
||||
],
|
||||
"ID": "d0469d09-b007-490c-b22e-1dc9ed953d0d"
|
||||
"ID": "560d1637-206c-428b-b348-0bc18e17414a"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
@@ -589,7 +589,7 @@
|
||||
"ID": "6c7b7dc64b644d0cadaa3e58ae25fb27"
|
||||
}
|
||||
],
|
||||
"ID": "9b6f052d-57be-459a-9cfe-6024f3804c31"
|
||||
"ID": "71243830-5216-40a3-a6b1-5939b0753a02"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
@@ -638,7 +638,7 @@
|
||||
"ID": "3ea9bb1ee1c34288bc51654ef1abf496"
|
||||
}
|
||||
],
|
||||
"ID": "36341f45-c565-45b2-8eea-7425d38cb4c1"
|
||||
"ID": "122e532e-7bf9-416e-8429-2be97ef447db"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -658,13 +658,13 @@
|
||||
"ID": "2aef2dc2638a4d93b234647dbb3708be"
|
||||
}
|
||||
],
|
||||
"ID": "cb216769-5e98-4130-a383-5630ee8b5756"
|
||||
"ID": "e37a30f6-824b-4309-b099-b50321d85357"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "优先使用手动指定的提成金额",
|
||||
"ID": "c2cdacc3-0614-4a16-a0eb-d486d11a01d4"
|
||||
"ID": "3c4043b9-0284-477c-81f1-63f1c8d5119c"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -684,7 +684,7 @@
|
||||
"ID": "c4fead524128456483f3f5a034ef3aac"
|
||||
}
|
||||
],
|
||||
"ID": "fb135ab1-2aac-43f2-9282-f34f0a34dc21"
|
||||
"ID": "12836376-7996-426b-89ac-c4d2903707c9"
|
||||
}
|
||||
],
|
||||
"Comments": "计算成员的时薪"
|
||||
@@ -823,13 +823,13 @@
|
||||
}
|
||||
],
|
||||
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
|
||||
"ID": "ab6e8070-011c-46cf-b195-7596fcf2998d"
|
||||
"ID": "62c323bb-a8fd-4f6a-bef3-c12ba2a4c36e"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果分配到人头，则判断该人总计划工时还够不够",
|
||||
"ID": "096dcda9-2b0e-4306-98f9-ed7c1aee6088"
|
||||
"ID": "3008b6ad-c950-48cd-b0f1-8e43800742ad"
|
||||
},
|
||||
{
|
||||
"Condition": {
|
||||
@@ -929,13 +929,13 @@
|
||||
}
|
||||
],
|
||||
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
|
||||
"ID": "d922d6c5-7e61-422c-a1e5-4b254fc30707"
|
||||
"ID": "5e7fd067-2fb4-4012-bbd2-c5dfa130297e"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果是共用任务工时，则查看任务计划工时够不够",
|
||||
"ID": "81b3873d-5aab-4656-a210-27103bc25954"
|
||||
"ID": "9388a07b-e142-40cd-916d-9e9611d3e10b"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -977,7 +977,7 @@
|
||||
},
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "b7abf874642d441799e38adc4a83c517",
|
||||
"ID": "9531597e7dd04790a8b3d8edf8a056fa",
|
||||
"Comments": "从视图统计项目的信息"
|
||||
},
|
||||
{
|
||||
@@ -1015,13 +1015,13 @@
|
||||
"Message": "该项目预算费用不足，为确保项目成本可控，请联系项目经理增加项目预算后再提交。"
|
||||
}
|
||||
],
|
||||
"ID": "449853d5-df3d-47c8-bd5d-4d5576ea30b8"
|
||||
"ID": "94f1c942-3547-4a4f-b90c-80abf2f29da0"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标",
|
||||
"ID": "80f2fd34-243c-4dad-8ba8-3c2501911440"
|
||||
"ID": "c218eb9f-1c2a-4ad1-94c2-f987d31caaa3"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1080,14 +1080,6 @@
|
||||
"GUID": "21ea4bc4-f68e-446b-9760-413f048a32ea"
|
||||
},
|
||||
"ColumnName": "总实际工时"
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "View_任务工时统计",
|
||||
"ColumnName": "总剩余工时",
|
||||
"GUID": "93c3c2b9-a863-42a1-9eab-7159aaa0f7a7"
|
||||
},
|
||||
"ColumnName": "总剩余工时"
|
||||
}
|
||||
],
|
||||
"SqlCondition": {
|
||||
@@ -1132,7 +1124,7 @@
|
||||
]
|
||||
}
|
||||
},
|
||||
"ID": "1742b464cefc45548e4051a84a1b4d26"
|
||||
"ID": "bc9f93f8c0874fefba55401ba5796ea6"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
@@ -1161,10 +1153,10 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=ROUNDUP(核定工时/分配天数,1)"
|
||||
},
|
||||
"ID": "0a6bb6880fa44256b05d2356d87df007"
|
||||
"ID": "16367bf85236447fb1f75968ab5e3c35"
|
||||
}
|
||||
],
|
||||
"ID": "a205ba40-f3e8-40e3-84ee-69fadd53b39b"
|
||||
"ID": "aec2fbae-83f7-48e5-ab7a-5fae797b336e"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1175,10 +1167,10 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=ROUNDUP(待分配工时,1)"
|
||||
},
|
||||
"ID": "d298d7ee2bed4e108a7671a1a6475966"
|
||||
"ID": "e94b98e14b7a4a5ba0254784a076d6cc"
|
||||
}
|
||||
],
|
||||
"ID": "21e85c17-929e-4c55-b312-e208965027b6"
|
||||
"ID": "4d5a916f-49ba-45ec-bce5-69454395a99c"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1220,13 +1212,13 @@
|
||||
"ParameterName": "本次核定工时",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=IF(计算本次分配工时>统计工时.总剩余工时,统计工时.总剩余工时,计算本次分配工时)"
|
||||
"SerializeProperty": "=IF(计算本次分配工时>(个人工时情况.总计划工时-个人工时情况.总实际工时),(个人工时情况.总计划工时-个人工时情况.总实际工时),计算本次分配工时)"
|
||||
},
|
||||
"ID": "cfba414b12c9457984f4451f7b08a1eb"
|
||||
"ID": "227013c4596747f7b28cd8fcfff02773"
|
||||
}
|
||||
],
|
||||
"Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，",
|
||||
"ID": "3a1f2c61-8a35-4394-adbe-7502a81a8999"
|
||||
"ID": "07879862-2b57-48db-9176-57f5de797991"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1237,10 +1229,10 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=计算本次分配工时"
|
||||
},
|
||||
"ID": "b54545f6b13d4b8697add0630e495a6b"
|
||||
"ID": "f0457ba04eb3495e809ef050fb21fe4f"
|
||||
}
|
||||
],
|
||||
"ID": "4bc8ac5e-efae-48b2-8768-fdab0f34ef8f"
|
||||
"ID": "32327428-2991-4210-94d0-fbdfc7587c44"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1254,7 +1246,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "fda79c92-f467-4574-9c32-f0b801a012ac"
|
||||
"GUID": "a3028e2b-e561-42c6-9ee0-c8eb03134e2e"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1265,7 +1257,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "任务ID",
|
||||
"GUID": "770c4415-4e21-4f8c-a597-abd7f04a0bfd"
|
||||
"GUID": "735e3d1d-b8b9-4ba3-a88a-0e21b9765cbb"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1276,7 +1268,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "工时日期",
|
||||
"GUID": "2bc8dc66-9ca8-4604-8b97-08dbbc9a626a"
|
||||
"GUID": "cffbc1e3-052a-486b-89ec-6078865f6e90"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1287,7 +1279,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "工时类型",
|
||||
"GUID": "9789ce12-dd35-4498-9b72-76c43e4e2144"
|
||||
"GUID": "e07c6e0d-1142-463c-a205-880c29183a0d"
|
||||
},
|
||||
"Value": "实际"
|
||||
},
|
||||
@@ -1295,7 +1287,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "执行人",
|
||||
"GUID": "ec1c5767-50ba-447b-837b-d4666cdd9f2d"
|
||||
"GUID": "58b7816a-560e-4ab2-95b5-b8a8f04d6c19"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1306,7 +1298,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "执行内容",
|
||||
"GUID": "4e77c9cd-5d2d-4d0e-8332-038313abf74f"
|
||||
"GUID": "083276ff-58a1-47be-89fc-cd4989e8e4d4"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1317,7 +1309,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "工时",
|
||||
"GUID": "f72ee1ba-2be6-42d8-aef7-ffd0bc436f3e"
|
||||
"GUID": "36adcdcf-f764-4fdd-8bf8-852b9d0af714"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1328,7 +1320,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "上报工时",
|
||||
"GUID": "34a6d798-74c3-4ceb-a2df-8ad4cd476b42"
|
||||
"GUID": "eb754d4a-fdd1-4610-8d64-80882781bdaf"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1339,7 +1331,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "时薪单价",
|
||||
"GUID": "c2270dad-808a-4a8b-8489-95d218b811f3"
|
||||
"GUID": "2787b855-d8ee-4214-8c5e-654f37c81bee"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1350,7 +1342,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "提成系数",
|
||||
"GUID": "bd688763-4c3e-4486-8153-d908dfc3dd6b"
|
||||
"GUID": "d3df389a-4ca3-4353-aefd-d8035b965e93"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1361,7 +1353,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "任务工时表",
|
||||
"ColumnName": "时薪来源",
|
||||
"GUID": "f5922f75-cb51-4a11-bc6e-52b1e145d543"
|
||||
"GUID": "4c3d1a7c-5e48-48dd-9f2f-0e28f5bc1550"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1377,10 +1369,10 @@
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)"
|
||||
},
|
||||
"ID": "5d5c7f7462d24dc2aac507bf580830d5"
|
||||
"ID": "81a6634be71a43669cbaa18cb041393a"
|
||||
}
|
||||
],
|
||||
"ID": "2518bb0b-a019-448d-8a4c-a0d160317347"
|
||||
"ID": "dc0a2408-a1e6-4094-84db-1d38ba286103"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1393,7 +1385,7 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"ID": "eed828f6-8f26-4a77-8e83-eb71586e1d44"
|
||||
"ID": "a1751d3f-23dc-4468-81ef-939d95acbd61"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1409,7 +1401,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "项目动态",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "657294a7-01c3-4e27-9a65-1e840457d870"
|
||||
"GUID": "2a44e36c-2422-47b0-8572-6ca620733990"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1420,7 +1412,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "项目动态",
|
||||
"ColumnName": "项目动态",
|
||||
"GUID": "5dcbe3d4-7544-4e8a-bacd-fbc771aed2cc"
|
||||
"GUID": "eb8e7fe5-80bd-4b7d-a6d0-175adcf06de8"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
@@ -1431,7 +1423,7 @@
|
||||
"BindingInfo": {
|
||||
"TableName": "项目动态",
|
||||
"ColumnName": "执行人",
|
||||
"GUID": "e7eba9e1-edcf-4a25-a4fb-371d2eaaa4c4"
|
||||
"GUID": "8cdf3828-fe23-4904-886b-da111157683f"
|
||||
},
|
||||
"Value": "%CurrentUser%"
|
||||
}
|
||||
@@ -1445,7 +1437,7 @@
|
||||
"Message": "报工成功"
|
||||
}
|
||||
],
|
||||
"ID": "d1fdad64-b486-47b5-82fb-f02a215bbccb"
|
||||
"ID": "b728b35b-37b0-4979-9b51-2f3bfcaac0e1"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1458,12 +1450,12 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"ID": "4d25467c-a496-40ef-b621-fbb6586924bb"
|
||||
"ID": "14c3dd1e-b660-4b79-b4dc-8f55f163e0b4"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "e7271fbf-3edb-4ebe-b4df-40c63c757ee5"
|
||||
"ID": "f5991806-add2-4d20-b266-f17d2e60d061"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
@@ -1473,7 +1465,7 @@
|
||||
"Message": "成员不在任务内，无法报工！"
|
||||
}
|
||||
],
|
||||
"ID": "8ac54198-db2f-4d23-a42c-ed7d9435c2ef"
|
||||
"ID": "447cf554-6508-427a-ace5-0592f83b8e2e"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user