diff --git a/.collaboration b/.collaboration
index 05bcf0f9..b730519f 100644
--- a/.collaboration
+++ b/.collaboration
@@ -21,16 +21,7 @@
},
{
"ModuleName": "TableView/子任务视图",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T16:51:03.1060331+08:00",
- "ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\任务\\子任务视图.json"
- ]
+ "ModuleType": 23
},
{
"ModuleName": "Tables/字典表",
@@ -70,29 +61,11 @@
},
{
"ModuleName": "TableView/View_任务工时统计",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T16:54:34.9132355+08:00",
- "ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\工时\\View_任务工时统计.json"
- ]
+ "ModuleType": 23
},
{
"ModuleName": "TableView/人员工时统计视图",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T17:00:29.4804493+08:00",
- "ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\工时\\人员工时统计视图.json"
- ]
+ "ModuleType": 23
},
{
"ModuleName": "Table/任务工时表",
@@ -173,16 +146,7 @@
},
{
"ModuleName": "TableView/View_项目统计信息",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T15:23:49.3314126+08:00",
- "ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\项目\\View_项目统计信息.json"
- ]
+ "ModuleType": 23
},
{
"ModuleName": "Table/项目任务分组",
@@ -206,29 +170,11 @@
},
{
"ModuleName": "Table/项目表",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T14:59:38.2849697+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\项目\\项目表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/项目预算变动表",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T14:57:14.1635769+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\项目\\项目预算变动表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Pages/任务",
@@ -244,17 +190,7 @@
},
{
"ModuleName": "PCPage/新增报工",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T15:38:45.2828847+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\工时\\新增报工.json",
- "Pages\\任务\\工时\\新增报工.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-任务信息",
@@ -270,17 +206,7 @@
},
{
"ModuleName": "PCPage/任务-基本信息",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T15:24:51.1135892+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-基本信息.json",
- "Pages\\任务\\任务-基本信息.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-子任务列表",
@@ -544,19 +470,7 @@
},
{
"ModuleName": "PCPage/项目工时",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T16:54:14.7042045+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.json",
- "Pages\\项目\\项目首页\\项目首页-容器页面\\项目工时.rd",
- "Pages\\57e644c056074f9d885f24a5bd7b4ae.json",
- "Pages\\57e644c056074f9d885f24a5bd7b4ae.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目成员统计",
@@ -584,17 +498,7 @@
},
{
"ModuleName": "PCPage/项目信息",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T16:36:57.2646053+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目配置\\项目信息.json",
- "Pages\\项目\\项目首页\\项目配置\\项目信息.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目列表",
@@ -602,31 +506,11 @@
},
{
"ModuleName": "PCPage/项目审批",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T16:40:26.8769616+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目配置\\项目审批.json",
- "Pages\\项目\\项目首页\\项目配置\\项目审批.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目标题",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T15:10:55.6009676+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目标题.json",
- "Pages\\项目\\项目首页\\项目标题.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目首页",
@@ -658,16 +542,7 @@
},
{
"ModuleName": "ServerCommand/新增任务",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T16:47:41.5098255+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\任务\\新增任务.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "ServerCommand/移除任务成员",
@@ -687,16 +562,7 @@
},
{
"ModuleName": "ServerCommand/新增工时",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T15:47:09.2578453+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\工时\\新增工时.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "ServerCommands/项目",
@@ -956,21 +822,7 @@
},
{
"ModuleName": "PCPage/项目成员",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T16:40:13.3129841+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员.json",
- "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员.rd",
- "Pages\\6899a8cead694b3ba00307b6756dbd7.json",
- "Pages\\6899a8cead694b3ba00307b6756dbd7.rd",
- "Pages\\007ea4aa4c7440478a9a092179dace8.json",
- "Pages\\007ea4aa4c7440478a9a092179dace8.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Pages/项目",
@@ -1006,16 +858,7 @@
},
{
"ModuleName": "ServerCommand/修改任务预算工时",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T15:15:15.892625+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\任务\\修改任务预算工时.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "PCPage/项目成员详情",
@@ -1059,16 +902,7 @@
},
{
"ModuleName": "ServerCommand/新增或修改项目",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T16:36:57.2641517+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\项目\\新增或修改项目.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "Table/任务评论表",
@@ -1351,17 +1185,7 @@
},
{
"ModuleName": "RdlReport/工时报表",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T16:53:58.9033578+08:00",
- "ModuleType": 18,
- "ToRemoveFiles": [
- "Reports\\工时报表.json",
- "Reports\\工时报表.rdlx"
- ]
+ "ModuleType": 18
},
{
"ModuleName": "Pages/财务",
@@ -1493,17 +1317,7 @@
},
{
"ModuleName": "PCPage/收益中心-收益明细",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T16:52:29.9829082+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\收益\\收益中心-收益明细.json",
- "Pages\\收益\\收益中心-收益明细.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/收益中心-结算申请记录",
@@ -1515,17 +1329,7 @@
},
{
"ModuleName": "PCPage/提交结算申请单",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T16:52:15.9154443+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\收益\\提交结算申请单.json",
- "Pages\\收益\\提交结算申请单.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "ProcessItem/结算申请",
@@ -1545,17 +1349,7 @@
},
{
"ModuleName": "PCPage/审批结算申请单",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T16:51:40.4520145+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\收益\\审批结算申请单.json",
- "Pages\\收益\\审批结算申请单.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/办理结算申请单",
@@ -1583,22 +1377,10 @@
},
{
"ModuleName": "PCPage/项目预算申请历史",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T15:04:04.2596148+08:00",
"ModuleType": 1
},
{
"ModuleName": "Table/工时分配方式",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-30T15:32:58.1791028+08:00",
"ModuleType": 7
}
]
\ No newline at end of file
diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json
index c8cb7329..2840784e 100644
--- a/Pages/任务/任务-基本信息.json
+++ b/Pages/任务/任务-基本信息.json
@@ -192,12 +192,10 @@
"7,1": "执行者",
"9,1": "项目",
"11,1": "时间",
- "13,1": "任务预算工时",
- "13,17": "剩余：0小时"
+ "13,1": "任务预算工时"
},
"Formulas": {
"11,2": "C16&\",\"&J16",
- "13,17": "IFERROR(ODATA(\"View_项目统计信息?$select=工时成本情况&$filter=项目ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\"&$top=1\"),\"\")",
"1,18": "IF(折叠全部=1,\"展开全部\",\"折叠全部\")"
},
"AttachInfos": {
@@ -426,7 +424,7 @@
}
}
],
- "ID": "9da148f7-9a68-4225-b644-41a4f94cb611"
+ "ID": "ce97c7e9-06bb-4f53-b487-627553341df6"
},
{
"CommandList": [
@@ -441,12 +439,12 @@
"BtnText": "知道了"
}
],
- "ID": "e694201f-cb58-40aa-bbee-d90e98f91f67"
+ "ID": "4edd99e6-a361-454b-bcae-09974e3687ef"
}
]
}
],
- "ID": "a5a0f086-a23a-44d3-adb6-f11ab0e5783a"
+ "ID": "32d51ee2-4bba-4922-ad7b-4b1513cd4bfd"
}
]
}
@@ -504,7 +502,7 @@
"ShowConfirm": false
}
],
- "ID": "e14ed784-3492-41cf-aea8-8801d9e2b32c"
+ "ID": "60ee9823-cc47-4f52-a379-e1b2e9ee2d3e"
}
]
}
@@ -608,7 +606,7 @@
"ShowConfirm": false
}
],
- "ID": "7c2e76b2-3a85-4e2b-87f1-2db7d3077669"
+ "ID": "bee8b54a-3c35-4261-89e7-0339352df1c7"
}
]
}
@@ -714,7 +712,7 @@
"ShowConfirm": false
}
],
- "ID": "41389ab4-6d13-43e3-a564-23bcd05b3096"
+ "ID": "8ce8ab6e-c140-4756-aae9-e5d69d52b737"
}
]
}
@@ -751,7 +749,7 @@
"ShowConfirm": false
}
],
- "ID": "a344f462-c086-4b36-8d96-4e8503589dde"
+ "ID": "fb72a660-3168-44b1-afc3-95412c2569e0"
}
]
}
@@ -857,7 +855,7 @@
"ShowConfirm": false
}
],
- "ID": "c6915d2c-da8f-4b3d-b3e9-35b71dff9e04"
+ "ID": "a9fbd67a-6a62-4450-8bee-66e77224b8a2"
}
]
}
@@ -1011,7 +1009,7 @@
"ShowConfirm": false
}
],
- "ID": "7e9fb3fe-3c97-4e40-a080-3c6a3c587f0d"
+ "ID": "f5cc882e-bb2b-455a-9243-1d222ca8afbd"
}
]
}
@@ -1150,12 +1148,12 @@
"BtnText": "知道了"
}
],
- "ID": "24f3a058-d443-490a-81be-d31253f6ba87"
+ "ID": "e45155f3-89df-42d1-ba3c-d34899cdaa79"
}
]
}
],
- "ID": "550145db-142e-4648-849f-30de3349867e"
+ "ID": "3586d041-718c-4407-84a4-5c5186ce85a7"
}
]
}
@@ -1181,6 +1179,18 @@
"controlsPosition": true
}
},
+ "13,17": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "ID",
+ "GUID": "409d7714-3aac-49da-92a6-e29098230608",
+ "RelationBinding": {
+ "RelatedTable": "View_项目统计信息",
+ "RelatedColumn": "项目ID",
+ "DisplayColumn": "工时分配情况"
+ }
+ }
+ },
"15,2": {
"BindingInfo": {
"TableName": "任务表",
@@ -1259,7 +1269,7 @@
"Text 1 50",
"[AUTO]General",
"Left",
- "\"工时预算使用情况：\"@"
+ "\"工时使用情况：\"@"
]
},
"CellStyles": {
@@ -1434,8 +1444,8 @@
"5,2,1,7",
"7,2,1,7",
"7,10,1,7",
- "13,17,1,3",
- "13,2,1,15"
+ "13,2,1,15",
+ "13,17,1,3"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1521,4 +1531,4 @@
"Formula": "'任务-基本信息'!$B$16"
}
]
-}//D4we+XHdc46rnonerX5iANehZ8GQFZE5x4GpjWNB2kkTBPvJcDHNhn9Mu9QdDYUZ6byYF5mDwDIgJwA/TJUtlhdRfe5a80OC1nCn2cGSLY3+ub6fixwXi8g5eV9Ke4ZX7ww2F2Suaj+GmOyxU61aIP+vM3cSdadJRhEJPjbqIIWqO0Ez7bcct9DRSzqjlA3xY3eayUS0lzAk+swU+JueWmdLALxvV0dYV6dwIb6g+ladtDi5ET0pT8LegIruaR0v3Bs8IGEpVZlwIJIa5RiFrOcthnFpm270d9Vbkl5Cgopps0zx0QdELSd5sM/xAgoTfBervbvIwWaip5nOo8JmLnlsOcmt3zz5YrPKGVlHuygVgpx248FKhG+lqsJ6Amx+3OvfkN/vvliHcg4sQMmS3I6g2vM+PjZKKuV12X4Tj4BUtsgJw5tqztN7e3FUKvxipc8xQANivo4W+nBwjlhMpspzLxLjVj8yTYfzWgRsvS9x3t7/hXoI7Lrp++UpuKv7KpPdrFAN4JOXCL9HmUCvnwckCRJFGns7WxWZpy+zeyCoNSGNm0T6l4dHssdYS2Z4GSRljbXuBKVS411x47Aj3su5Q+9v/2FEQN7o7ym6brloKbpafXH2VKQXL33OXX0Cm/jHvQezbnyycPc9p6T1UX5xLtGy5qTEn/JgUM7VJ22OXHK61PF4M1XMCndTxkM8c0Ak2wUA/gLo8LvFfvTRUgbK7/L8ZnZjrm+YyLX3bMwpzmlifun8jER0JnK+W0kEBINYMK910EsN/rCG70OEjIdzIIWzymjNk7ImZDEpaMe+wF7zfzZS9kVYovh7oVW99b9JuBH+CrosAQW/n3zMq00okGNEkGlt/a/QBJhNUyIsJUuPSK7TLxc9qCKGK5HZMuQAHqoUgcaG5h0Q+/90Uw==|920
\ No newline at end of file
+}//ERAM7LazsXoRyqXDyOAFqf0nzAgljwzxB0yt+w5UHVmGs9rkJzyNVGxg8RjsawZMZfCnbgW0A8BjzwhE9om31CWWpqr96uj94q88h939eFiaUvTmoUHPNIPQK3l23aZ8qvbt1CqFq99BY8Lqcr0J5h84aVvTE90ybEMFSApbeAl0RsGOpEiUroSS/tkOY/hNl1Cgdl1CXZhMMUK298SIaLeE1J/2YumMGkajsGhsl/8Nev84+R2wIx7J8tyjEm0tXu3vezvAz7uaTbY/oXstvzGHo3dd8FMEXO9CNFiNnaWtEHRvKCCE+hJ+y1SzRYrYnBxLD+wKaq1+YczFOdXyPjRbDO1iV0UfPD8w25qUxVxeyweEIjOn7kinTZodSgpw9bzdyqR2agP15IlxQlqcozhx4+nJLbjRwqpxuEpvWWNwKPkulCbRR2ytfrIce6xeiLqgVerR2zoF1xR2dwmyjOh+uMyLmJgs4nuuKPx/wqvtxoTUtmN6Bt4ZOV2Gvycneg0jO9J8EdCvMuh4Qfybgj0Tmh5QQ1lnljut/hI1bayNwb8+FQ2wrVJp87oRXAGddyVFUeqpvzrZjsGOKU03sZGbKdwZeqwglM/ayT6G8t6WQYvGL2g59tW7lFFm4l7YryQ9v+GIwKrWiLXNBlQ/TOLlUbbLm7OnNa1Mh3t8R7Xc0HyalvU/cWhipEI2uuww2TLVRaX8HWWx9FXgGwT4lkm1rdeZr2Q21jvz+a3nDAG+SUY281K4qApSoFzl6uK2NXqLc79nZJ9LSesaCDnN291qQDHvck028OnM1ILJXOCl8lh4QbTTmKdHehLwWpH43sLl7CYbI/vsh9iqaCatse+HOOzaoNqK7DLJcYPTzGZNnUmrsHgpXGHZxeL1ftnvQ562+lUNeQdN+KHGP7ITlg==|920
\ No newline at end of file
diff --git a/Pages/任务/任务-基本信息.rd b/Pages/任务/任务-基本信息.rd
index 7cc62291..f12570ab 100644
--- a/Pages/任务/任务-基本信息.rd
+++ b/Pages/任务/任务-基本信息.rd
@@ -4,7 +4,6 @@
"RowCount": 16,
"Formulas": {
"11,2": "C16&\",\"&J16",
- "13,17": "IFERROR(ODATA(\"View_项目统计信息?$select=工时成本情况&$filter=项目ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\"&$top=1\"),\"\")",
"1,18": "IF(折叠全部=1,\"展开全部\",\"折叠全部\")"
},
"CustomNames": [
diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json
index 5eab35bd..e95d879a 100644
--- a/Pages/任务/工时/新增报工.json
+++ b/Pages/任务/工时/新增报工.json
@@ -247,8 +247,8 @@
"1,1": "工时执行者",
"1,11": "工时类型",
"3,11": "计划",
- "5,1": "执行时间",
- "9,1": "实际工时数",
+ "5,1": "分配日期",
+ "9,1": "工时数",
"13,1": "特定时薪",
"17,1": "工作进展",
"24,1": "取消",
@@ -359,9 +359,11 @@
}
],
"type": "daterange",
+ "placeholder": "请选择月份",
"startPlaceholder": "开始日期",
"rangeSeparator": "至",
"endPlaceholder": "结束日期",
+ "format": "yyyy年MM月",
"firstDayOfWeek": 1,
"DefautWeekFormat": "yyyy 第 WW 周"
},
@@ -453,7 +455,7 @@
}
}
],
- "ID": "bfbb5d36-b10d-4ef4-b8c3-9a24ab50fc13"
+ "ID": "c5b9e99e-2dc3-43e6-93ac-18e027a0c928"
},
{
"CommandList": [
@@ -462,7 +464,7 @@
"ErrorCode": "0"
}
],
- "ID": "700b4da3-d136-4399-ac02-2cbc6d4c020d"
+ "ID": "b085c68b-479f-40be-968b-41ce014911c3"
}
]
}
@@ -498,7 +500,9 @@
"DataValidationInfo": {
"NumberType": 2,
"CompareParamType": 4,
- "FirstParamValue": "0"
+ "FirstParamValue": "0",
+ "InputMessageTitle": "提示：",
+ "InputMessage": "留空则系统按照项目设置自动计算，除非你针对此次报工有特殊调整"
}
},
"19,1": {
@@ -782,7 +786,7 @@
"ReloadData": true
}
],
- "ID": "50ce072d-d795-4d3d-b9f5-64df76e8ddaa"
+ "ID": "1a9d18d7-f5f3-4837-9131-12dc012a155f"
},
{
"CommandList": [
@@ -797,12 +801,12 @@
"BtnText": "知道了"
}
],
- "ID": "a81db5d0-60bb-4633-92bb-8f1bd0b07633"
+ "ID": "ae008719-f61d-4faf-9684-e3265681f99b"
}
]
}
],
- "ID": "ff64f21a-146d-41b6-a6e1-8c2f511364fa"
+ "ID": "967231d9-b243-4ee4-9682-8990b72d262e"
},
{
"CommandList": [
@@ -812,7 +816,7 @@
"Message": "用户已取消"
}
],
- "ID": "044fc9ca-fa53-4ec3-b054-be7d029236a8"
+ "ID": "2f3c1d23-a307-421d-a8de-aee1839b8756"
}
]
}
@@ -855,12 +859,12 @@
"LoadBindingDataOption": 2
}
],
- "ID": "71f696e7-0bc5-4124-a103-39262a735f82"
+ "ID": "4ae581c7-702b-4490-a00b-4245dde0621c"
}
]
}
],
- "ID": "1f197300-5d7a-486d-b116-8e14be610b4f"
+ "ID": "9df9717f-cedc-4e8e-8bbb-db2a9deed9c6"
},
{
"CommandList": [
@@ -998,7 +1002,7 @@
"ReloadData": true
}
],
- "ID": "c3937a39-5188-4c1c-97d5-8b8c66b9c0fe"
+ "ID": "3768a935-1059-4259-8b15-b2157894514c"
},
{
"CommandList": [
@@ -1013,12 +1017,12 @@
"BtnText": "知道了"
}
],
- "ID": "e07c223f-3a2f-45a5-b0b6-c1af9dc996bd"
+ "ID": "a42f8909-7cd1-48e8-8fb4-8bfabc3d806d"
}
]
}
],
- "ID": "b520bb2c-61ff-4b37-8bd6-2ac7fb179fb7"
+ "ID": "4e3e42b6-4322-4ea4-af85-6bf7034d123a"
}
]
}
@@ -1467,7 +1471,7 @@
]
}
],
- "ID": "0a89a84c-63ff-429e-84c7-eb7da6dacea7"
+ "ID": "97d420f3-81dc-44b5-9960-a2bb58035967"
},
{
"CommandList": [
@@ -1484,7 +1488,7 @@
]
}
],
- "ID": "f1848b7a-43af-43d1-9ce9-e89c72fb99d2"
+ "ID": "2bd5203a-7db4-4cdb-bff3-33bc2e058482"
}
]
}
@@ -1521,4 +1525,4 @@
"Formula": "新增报工!$L$4"
}
]
-}//x3iLiXdTN3I4+gyzx6nqFfcetj2vh0Uq5LjKJQ4/3FkbugW6s1PMwDtDaXudUOFRkwWM/I5QNJ/l1midRI21RgGkYv+J38+kEFn5uskXJXKsz9yRJ5o6WUtkcm1wMyTep8lBvYoMl/eP3dFHLInPlbH5IGTpncYKWBLhKLeKkos7vkEQ4QGk3dCKIZTcjR6M+LN5zWRNsLGcyMXKBPusw/YNrYwPJAbz+pj+dppaH9O+kVVujM8KGFGOt7x+S5i/BByszs+CEZQkwUyiNXxeNyQRTaq/Bkh0+SNmavaK/deZwWmz2u0uhQ/K4uwmkDR2TzK3cDXtcZ+5n72c7mSjqt+CkD3xdbIGH6iC619Z0R3l6ohHPTYDGCLDZSoO8z58v2G9WRHZcFc2fMWfagxGukw79AVtJEPKFoWLDZNgfZ4zQuIfVCI0cvIYiQVDyjIYepCDWrxiokI+2LmXpXm2AsC0VNAxgejFnDWo164zbk1NaRD6xyQM50vPfFhTumIBFnQeS0F/PETJKwV6vwwGDNM1qeUdMzYUPDSYu+gqJyEXmL63Y3CGUu1i5sYP5cWMYhoi9HXfdgrJMuGyW6RCsGO8KT+rF4GGwZ8KldCEpyG7u5PQBaaq4rxtDieIJuqvVxMlps9GnH7lg/Ei7eeC8Oervx9dlHLUxwN5VTwIKqavaegZpq1/0A15F8OmZFuZ1nD5SKuu+Z4YeStNIhzB7mK8s5g985kR7wge457PmwHrGuUtu1O+DQWFVqlaAWzxN9XAmXTT2V7Rz2V5b/I6M402vrlf+ZJFCzdKg9ONor19L8Qy8e/Bn93ERQFt2DnYRxvhtM5MF5bBLKp4oOxr2QM1go6F2imbVjOwt1CbTTBJwaBzmfuekqnVUivi/y4xk7HD0lMVSHaHcoFbYo4gIg==|920
\ No newline at end of file
+}//CIRnT83cZS51EU3CVyO1IzADub6fbAVkaWlKIq002Esa9+KsMU3/3aCvkxRvLcI9yjQqGq/BO9Xk6qYzkp3f3rkoF15k9B4ClP5oV3t+MJFrU3PBotw1kA1/pMKt+CUEkMTaKEkVmcovzD5Fw+lQ4OE7sx2pa5Ht3c0S+FVI6aBJMhD1NT127nq7RBmJKEZSKKVI6+Ri/xpaFoL9+VYFI7CNSyiVKPT1Fppe5SjKmWe18cfIAQ1uiKKNZm6XdVxqJgRqCJ4NjTqRCi8sj61ImzTmKoKqvcpA033Clgd0BllsmbRP4w43Q/Q8484LssNui+VtporUZ1FxkzrVjw+aK8m4VHE/DW+ncGFHuxGCe1Kqk5NqLh50Y3qhhxmg/07XrO6b/V1z+n6+e65oGp6Ho4pta2diSeTtv+F4v0MsN57oXB2xVsi+n+140O5siafzM2FjpyPKHp6WG/0BtpMqELmNGZYB2wzBstd28Jwc5Gyv+HfKfaDqrMiVkAwUrObAGxOm5k9vMu6iFQN4VeWVHbyigL7lNMiaID/v9QdksJq6Hk7+hcrUQuTpiqVLJOYtVpu4x/aej2BKfYJrjUj8B9JT+aTdFT1L199aklv7HAVFWYSq9x3dqouI9QH41JuVbauz/DP8rzA0W/UXRGXTH8wCr2GgaAtArhdIj3Zx2rPQ5ctiFdnnCthKmidYZH+Qqf9/JyRQXOMq1qPmPSVcg5ZHN3FyZ0iLDaEb7+lmP9rhR6QT3+5Lf/Fmm3qlEhegW8GDSPs7pbJNXBlC0/e2bkn+fYbU5DJfA4S21EID83/3tGlDJ0x/KR/k5FwCCYOch7/PWGLQinSpRcYk4g0RS0FFl6TB3/MSq2N91CrjNfav7ALwf7CUafjpRCkgpFvG2IEgZvoK7xozBqgBHaMUbA==|920
\ No newline at end of file
diff --git a/Pages/收益/审批结算申请单.json b/Pages/收益/审批结算申请单.json
index 1adffc7c..8580e106 100644
--- a/Pages/收益/审批结算申请单.json
+++ b/Pages/收益/审批结算申请单.json
@@ -311,14 +311,6 @@
},
"ColumnName": "任务名称"
},
- {
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "工时核定方式",
- "GUID": "bb14a8b0-2fc5-4b3f-ab19-838f9731a3bd"
- },
- "ColumnName": "核定方式"
- },
{
"BindingInfo": {
"TableName": "View_任务工时统计",
@@ -338,10 +330,10 @@
{
"BindingInfo": {
"TableName": "View_任务工时统计",
- "ColumnName": "核定工时",
- "GUID": "3becaf7e-d7bc-45ce-bf26-568c702e0717"
+ "ColumnName": "实际工时",
+ "GUID": "5fff5f41-a4f8-4f91-a020-1e64c598f8c2"
},
- "ColumnName": "核定工时"
+ "ColumnName": "实际工时"
},
{
"BindingInfo": {
@@ -887,4 +879,4 @@
"Formula": "审批结算申请单!$S$2"
}
]
-}//Brq9xaWAC9ZUSyXOB9L8jBIbo2+LUdC6q0eVuOc6HjgMD5xGG2ZPOvFJPpsq7mMpK24dY/dUHF0aSfrm5i9yLXrpvtv2C/FJCNPDB/dbIaet/uOLxj9tBsIdvz8URR7n1xlF9ca5I2OPDEL1H9Nmw6+kA5aGqLqNofxIpp87g40aARNQg5zSYz/gjgzq9FqBbc3+/ozzzEYUmWCBv8yW/uPjRHrbn0jStKcAjYV6IS3e3UGI9Tk0NZLjzoDZlo9a3ob93Pg2D4GF4CIZhVnf0YGS7bvwPnyyChrcJyHO6F3L1NllHE9pEc6a/ou4VIqAAVfsLSh3oT5ycKxET77UVkRjrpvaNaI5ILsM7GYuHNbmvVgHoxzQFcpsihUiv0mgk/Jqw+2qy9NqPM4Kmp4Goyo/aDjHxHu34jlpR4epPRoXYAtgBLeaJxZGIqDxVlRk8jDUQwUaRLu2McsZjCHaVSNS8sQr1SzDPkXNuloqMMHpIAQta8+B0O/iX9AwFJ64xPC4IWbtV52nkaAtAhgEC+TQCXHoSj+NrNF/V7qxSIaWLFUqZ9lyDcbfZ47tYco1a2+VCW4w7G95/5zlGIfHr93Zr59LZVdqCZHSyeAatICcD8rO0v/gpPW91uRQJEael05LPJxTn9gOu7CembPMI4vtmgNw60Y8JLPLXnfpjVSogUHdj5e8pYPmcdeXknbdcICp8FXBVwAYU6mkDOGpzvCVmhPhXoaqPNC7TYZvZi6BnnzV14vi+nD02TOgGi9xwy/LW9C0fw1iL7bRaumEPzf3VkskflnOr/NDoqG2AExqE8nNBFpxBROizwgjtDyUAbcGTR++YJjBmgW0KHlSPb8mSxy+gCIIIkMDwF9EzIhjF2v62Tq62fJ8SRdYq6KuXpEjYeRJ5njIoxSdifzbnw==|920
\ No newline at end of file
+}//Xvb/9QFQaiwAxqxu+4kIGxh+O92k2DTFf1wM8c6RwvlZGh67CKgwKtVLWZiMM90A4zNLvaLJQG6Fkzlra2eeBZ3GecO+NHpKNZVHPPEvatZZZHTOWD7kk7fAy7ddpVf5O7Szzi7OP9JR7X8a1LAuBcljIg2CxN2bQeYZ6TtoGX1nY6UELxxDsIjdAWySGk4n0AvhUX5ySudGrK9dIKvrFUZXEZET9QpjS1Zyw4VW9dVC7Nh38OQ1T846Zt2BnwKyKKZfQEbZn+BqDlxGlal8cahF4oTZUQCOCug8s5To5BA6eEz4Q58PzNfdo1qQHzXfRW8wpHz6GTJ74I4eQHL4IUOoKIKp7QjzS0HykZ9p8F4wHD9gz2rpiEacM0c3V547XWZClUXz3NMf0Wmw8ZUJ2C/0n3Rgv6lJsu2/GztswUdajLsGYRNADysv4k9eE3f8KZV+Lle8ab9SyC0SaTlERJuC8MZTeUTbnreMPXoJr69IHXRrvgo7NxgmjG0Lj9cheLFM0L4vLpPlPAFtEsceB0ma2gAIBAFEfQQ/qwQoFOpIafhuf+DbW5FOG9yi2HGl9ApjFtj2CjAR6UmsL68ybVc0WlZ+mVXpJSFB68uFAlLyfXSqZvY/G1Cng87eTugMAudShN1alHSLkMFKCjnAKaLlN6HKLoNLU8CHQ9QQlxzbjTkV+DvchwSikDjH/a2+6vTyazFnH8pvt8Y9bkppy9xmlZBfJ1tij8/o0+MgZFcO6bg1AI7e7MIK4aKzEyxHIP0nbmZGTtnRuJo1+//Y+FCUOp+cRZqR92y+9/DHlv/ZSmwDpVaQNWk8tauIjptDpC2fxnTLapQKHgbQjIXnndNRmtexvLhkt5dN9W34zWhE0wOxSK2zUggTI4JW+UW0pVAueq+c128yGOEZs1sUAQ==|920
\ No newline at end of file
diff --git a/Pages/收益/提交结算申请单.json b/Pages/收益/提交结算申请单.json
index 20a7cdee..f910b881 100644
--- a/Pages/收益/提交结算申请单.json
+++ b/Pages/收益/提交结算申请单.json
@@ -93,7 +93,8 @@
},
"24": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
}
}
},
@@ -368,14 +369,6 @@
},
"ColumnName": "任务名称"
},
- {
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "工时核定方式",
- "GUID": "566af42b-e314-40c8-8af8-78edf75bc218"
- },
- "ColumnName": "核定方式"
- },
{
"BindingInfo": {
"TableName": "View_任务工时统计",
@@ -408,14 +401,6 @@
},
"ColumnName": "实际工时"
},
- {
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "核定工时",
- "GUID": "2cb22b61-50bf-4eb2-ba82-0ae7bf01e9f1"
- },
- "ColumnName": "核定工时"
- },
{
"BindingInfo": {
"TableName": "View_任务工时统计",
@@ -1218,4 +1203,4 @@
"Formula": "提交结算申请单!$M$25"
}
]
-}//u+HP5HCRVUFNMrTfhRAK8PlBTQw7onvVEuRuvJyLoz6X/MEL12BCMR/611JNLg7xFSvSz3V6aB/BuH+2MJc9P2S0EQPS+4i1+rMmwx0Q4UlI175dEiK14RHRFOLWD3seyvursk5Ze1ktjtjgUC0FI0QidI3CREK4p9TraETG8jTtgTM7ffvQk8CYTl/7QamVNkDKQILIkoas8730ypxTAjeV8vfuxpSCYQBluEIys9yvrt2sAN25HjtRfmOQQK59i9aPMK6EUL//9N2q8VbA/Scsa+EspuVaEKklyqMuL8tt0FGQsTit+mD390EwFl15iUH2Kni2zWPu2/2zHP7elL8IjOBQa6dcKnZ31SHv0wreMzU0qg4diu9E0n7/uYVmljOhYu9/A97HjdPswAkkdckBKt2CEvDNsQ2YRn6Qkh5eiKP8CYvwDTp/9ZUwj/U9YSi0y8eSrxxT6yNyZBmX8MZjcW5lklRaAALcvTP4eIY9vLqNAzkyvfBQDkecu/Q+I3oAU8HSRV4FLNqvC1kFt8yqxhZSZEm55lML0zdmHuX1qXd3QRLQfHeAS9oWYvsf74PkHJ5DCgUqu9L+BBRXjQEreTxZd+EM092apCmyaJbFX9YYvtTmSW3zrkb9p6FuUTNnZNBbWEVG4RVeCBMpx7pSe/pS68+jW3bJpCOGcSjjtDlfSmWPXRUM/BGUWhkKzaepPJ2l+ul2f4KKtax9W9Fa21XTknDorHbhavIFdmDMmNiAI/A+NsAsQxG7GNLUq8Eun/n+f3cxTPOEmpTAGQuLxSs4Bg25y299jex6sVQsC1n2y1+M9lJHkHepvQH7+4Xlp+FY7pGNJEyInYUTzAVWxoCm3VMyXeoI/j7l+zWyPmUdpDqBIngXEDTZimF+Zn1w+QCiTl48efzEhKxXbg==|920
\ No newline at end of file
+}//jjGQiz2xDI+s86KrxahO8iwdVLPf9Qc2U8NCu5SjYOkrDR2Ve8XbGB4vpEYh5E7oxXeHei9FTy3giPe5hWaJx1OQo5boqgz04V9mLWWEu5qqZj6jDvIPu2ESx37RoGZ5ysB+glHnxmqig6x05XUVICwomBKg39AvuxS9MinTC5bDPzHxebXncDdcm/rMYdA/IhF/65C5g4xIq+oZCe/XLMh+A6Lk6f94RgAwwxJBfeEsqBZxvL+SoJNlX8oKafUv+zXpifT1byU5Sv6IOX0Py980Th3b+/cRCRQS1LVHR6B0a3p0WzIRB91pZ91+KRu2ytncaSHFtGHnRBH911A4hEO0h0EIli8+pKOPYAdfqP8eSa+hzMtkPmZK3VrfrOw9+N3TSe+ByrHrYl3GFF0bsyFIeGQWHxFyDfdzWIDpIstMfdECZ1+lC1lXxL3CcAySSLPawpUK+OVgxEU1WiATaZOuDzy9HzBljAOrsyIAbZzMN9EexA37XoSAjfLsaI4b0tAjiFVE6wsV68cqLMEMk/4hP4+dM9x/aH2Rd01MLe4rBQyLNCCq+WKSe1IMP69ZaPbBUW9GtFYinnr+8oYlducUnh1phCBM53Wv8ASIxpDE6jo9mSwvpb/PwdjjumzYxKqf6HxR6a/1Oiu0HQLgdY/vNnlEZ7nnXVZtlbup/NBTn92tR2Ye6DKvumpEp443TNqxXFA24LPGJWP41whQZNw7sbwie9rnjkWbVWPaumeBUq1i0fAnaNtV/11IK22KcNjSZCVQ+JFIGOEZI012SB5f1kRd0vJCLJH6GQfGJexo9Pm/u52XL7TnxCRaWP4fQXGaGVXR4tIzNbyW0aNMG8MG+sWi8kbQEEDa9xSIlWw5cBdEb+mgN3lnj7H2OpXTVY7PJQVYeyVvghxtT+cC3g==|920
\ No newline at end of file
diff --git a/Pages/收益/收益中心-收益明细.json b/Pages/收益/收益中心-收益明细.json
index b1634186..312106c3 100644
--- a/Pages/收益/收益中心-收益明细.json
+++ b/Pages/收益/收益中心-收益明细.json
@@ -317,14 +317,6 @@
},
"ColumnName": "任务名称"
},
- {
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "工时核定方式",
- "GUID": "f9ab5d24-cc3f-44ef-aa54-47e9eeccc5f7"
- },
- "ColumnName": "核定方式"
- },
{
"BindingInfo": {
"TableName": "View_任务工时统计",
@@ -357,14 +349,6 @@
},
"ColumnName": "实际工时"
},
- {
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "核定工时",
- "GUID": "d78491ef-dfb9-4fa1-8f12-b6795329425e"
- },
- "ColumnName": "核定工时"
- },
{
"BindingInfo": {
"TableName": "View_任务工时统计",
@@ -856,4 +840,4 @@
"Size": "3,18"
}
]
-}//Mv//zu4400oMccVB88FzHpsDdiGPPADtJW8EDemF65B/seBHVGWGQ9cwNpfhDQn1hNa0g8R0pe9t5KCWhUkY7pN0AfCy5FLAU4Bp7DSFE2oY/7HOFaZoaxqbm+Dqa4oq5nJYueJdH98cVDdZmBDUmHsbs2QsoS0Y86U9cOjCLJZpRYmF66I9xiiGzfJvL6OVMjSaDrLqpx6oO/2GJlRDHaE9LwaZiQA92ckbxlaa6Ea9lBzPGu4j5UfCj3sZQALyb/fS+V80gm7hUBmfu7b7nH1m4G5NGUP2w7FBMfjmXWRc6LNGImCnQIhC33eEbQ8UR37lutb5ZsgUoXMoSHx1mMJ4MUJANxSQFADw+VKIJiMb03K4il/UIR8W4vnavm6lFCzPGprYmcWqH7bchKfgOLzyJYKkwMDRSClPFYySAJKSTMp/5VeEr6Z9ZcglslUqqwYquNFnFRROXuLammGXhgpZrucxL6RtPBMpGWpeUW/k44Y5bwWLWAGFQBn4qz4p6z5R1Xp+PkjFkSyNi7cFsh864xErtDJiz+rgoqsQ0xeUJdLsgB3zpcC1AQTiOrSid8C3xelIcTOX5snNDHDtZ8bigDdknNYzSHVWiy6qtytpNsg6v4lfM/xEixoD4BwP5765F2NFcw6gHCcm1IqoeUjkS76oQdVadCTqTFpymbcqpxgwPhCOkdXxBdv//7oHThL6/43t9gJAyDTgiJ5YZRLvPO58/4UsBuqHzG21NfROes1MGaa/a/JgRUZCrRTD2iGUTuWZbs8q7cAufPUUX/9spUSPoSRr13mro6AmsPbIpd7ruLDqEnkueaDvI2bban8tzfQgWZsLidiU0etdaNHt6JjF6qWN9cztwClrswmuCjq9z85W8S5OYNVNw4YY0AMv9ArImvwnYwUhMuLVkQ==|920
\ No newline at end of file
+}//uciBmT3ENaWE+TdL0fQebu67Q748Em14+qTy/5sfuoKMoxcoHf7kA4M2P8dwR+zB2bf3nOV1gCPRRocO3FaUAz1HlShbgJzJsNVG1pyYTJCg0OjbRbKkFa4L1G5PPykJFk/wnVyzaz0EIuJQVn5X8iC5o7EICeSb6oY2LQVDAh7pwPWjsYNMU8j09OMbcH3kHbLB/sbrkziAz2snn3JkENeC0HmpWpyV1CPLvXAOAQ/MTj/EEHBiWvCGQ8rETkkb/jew4L2ZKqmqEuoWzW3SEZ5eUNKtK3sCxhjmWphMSn0Q7W/95a/SoQEsIW8eWh7f/TqmzQ2ykN6q/cuGPYTgard5x7QL6fIWIt7WSOsq/lO9FO1JG32BfH+hTxYqdtL8KXwxAPObPZWMRjvILlD5T+/cErSnygUktgJWvUaQGm0u+yxsvSLIsDHDvCeXkhu4cRAtvsJtMsodc1RDt8qTOr7P3chNrv1Q4ZBfwe0pRliuV6RoSuVFKN1In554TQMI2oa96uiR/N3RaIfz4DQnXb3npR019uni5eRKvSTv/3YY+BWhO1mwImVL+khnyryXcMUgbsGZTfFj1lD5sCCWynXJ128ZGTae73Lr0jAdentGOXC9Dnfr68Yje78xM3F8O3d9HYptqBCXwIOZyPu0S/ySj+l1kosE/ekQF4uTVVW+Uzv+24B6fYeA4PbRiQ0dOJbGroKe7au/PiFo4k83rpZGBz/v6GYzek3AifwWsyodxV/RHLAYtCmVDaMdDCEua2oIQNGVmJaRrBHFuTNy6PGpRkXVQdBRX23VOwHWu++5d6EnNMwbC2l8Zmldp0eB0VEurgpGL//kiK39iDj5VhCv50YuwMBbxkt2LxTNOkOHeEyMXfUMGar3zbOdI0/pf/7diFN9HrKsWFV0GsAHQA==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json
index 13f07ccc..c9c57e21 100644
--- a/Pages/项目/项目首页/项目标题.json
+++ b/Pages/项目/项目首页/项目标题.json
@@ -252,7 +252,7 @@
"$type": "LoadingCommand.EndLoadingCommand, LoadingCommand"
}
],
- "ID": "59bb2410-19d4-4a9f-b37c-a19ec2d3518d"
+ "ID": "21e6a406-5ce9-4caa-b953-a8381519c357"
}
]
}
@@ -370,7 +370,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "ac73fe05-46cc-4758-b322-ae9d999f050a"
+ "ID": "3ecc53dd-a2ab-48fc-9e71-0978771dede1"
},
{
"Condition": {
@@ -391,7 +391,7 @@
"PageName": "项目配置首页"
}
],
- "ID": "07330a9b-4c9c-4c0e-b25a-d40c23f865c9"
+ "ID": "1307a6d8-5109-44eb-aa22-3cf5d48f720f"
},
{
"Condition": {
@@ -407,6 +407,12 @@
"value": "预算申请"
},
"CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PopupDisplayMode": 2,
+ "PageName": "项目预算申请历史",
+ "LoadBindingDataOption": 1
+ },
{
"$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon",
"ShareCommandContainerRefer": {
@@ -431,10 +437,11 @@
},
"ResultMessageTo": {
"SerializeProperty": "msg"
- }
+ },
+ "Disabled": true
}
],
- "ID": "ee03d4d5-9f85-4571-aa2d-14ce9e2c78ef"
+ "ID": "66f023a8-e6bc-48bc-ac98-c42f77967432"
},
{
"Condition": {
@@ -470,7 +477,7 @@
"Message": "操作完成"
}
],
- "ID": "3f4fe077-d63f-4ffb-89f0-28856543b579"
+ "ID": "b1fd4be5-fa37-4979-8ec0-946f4136e8dd"
},
{
"Condition": {
@@ -549,17 +556,17 @@
"IsOpenInNewTab": true
}
],
- "ID": "55b6492a-4985-494d-bbc2-bd1a1306a5ed"
+ "ID": "c36cd8ee-d5cc-4923-8656-0e93d44ab74f"
}
]
}
],
- "ID": "7266ff3f-f458-4054-8270-35ec810a5d1b"
+ "ID": "e2acbae2-09af-4bc7-9c06-f66556cbeb92"
}
]
}
],
- "ID": "281683d2-b465-4b03-9bfa-ba636ec9675c"
+ "ID": "f783c7b7-f331-4b33-b162-dc60c39a37aa"
}
]
}
@@ -633,7 +640,7 @@
]
}
],
- "ID": "2f218afa-e68d-4d94-8677-aa1816f4729d"
+ "ID": "a3ff93f8-a3f1-4d50-ab15-982947c34bab"
}
]
}
@@ -858,4 +865,4 @@
"PaperSize": {},
"Margin": {}
}
-}//5pGjx49MH1iiy74o+Cwf+1zbdItvusNQFbxcHsV11eLbRMeQgLTOhvS1GyArEZ9HdgEq5810AX9IABSVun7qIXEI8NRPi1H6e8z+fkpcKZooOIav1c1x1jbzRc8gHWNKh4PkS5qd1PE/7DzaojwllAbqLxSucaLpVFoQ0yKXwKFRsnDTMsz70AIFwz8L4qPnAa76qBATENPbmzx303TCpnQ3DZReJSsL64HrLccEZK0AebUQj6Fm+C4HYT8Njkq93OI7gGAkuzDHPn2JFETA/9BCUbzXQRIejiGEcBuDmMLdyYNO24AVCYUwfnmoN8HgzNTtnUpAx0FQUrJzYT9r/OkbTsb0pdoC6Sw6IDjIRcaclOPIdV5/Wj8zsuvnLhytMiSf22Qv9KNNi57ePJsRNjeeChpQKp61nTE1j/kpTYbb3MrItVngVFGvOGNfOBBNo4PLJY/XVw4I75zh61mzegfEobQwFDhfnBTZ8doz9wsLWiQLi2uuV9fBv/oxOL7fdnkSOfy99tjGlaloOwLHksuzpCNpGMRKB0BK1fHRf4Wf82WJLEIQUkHMhyvWiHkCDSotGJ7DdjUhy/vnyYCZETqxDLo9L5pZoh3GySj+8eo/ccF55iDwxsCx1ue+B14XoNjEU9sm1+IKfe7w0TVoJkW+ikzqlEbD2J4y/eWgKIpYvvP4uFft7rBXdsDhOw9USghATLQgItNnZ3kuObuMDNxQda91mBaA+RoJjJ7DJ7iZtJMexzHQ7lUl8YaBtIRBodhyaejFij2B+nfTY8fjNLUiNn9F+A+YuEDfhSpcwz5vgaFPmspPCilR/tbOXAqkY1RiKUdFm0SJCuQF+Y0KZqBkL+uK+RfXj+PjM15Pccc80me2k4LhgbRj8F54rsfbMNjkm0gRVKeESnMx9xmB0A==|920
\ No newline at end of file
+}//BZRlNKdfmYVNd/o+D/mbqcEsaRdZoCKgVhsi8GBdGn5v7lcmavZK9kTTSS2my7aFcWAcCX8KXFpVOfLsl0zpln7p6waFUIWOqS84KnA9F3rFB7dR/V0QcyDR7mMjfkmU1UlzQkNxrX4uTb9wGd9R3/taMQ+a5yGuQtajsOuXxM+4Bz5h0bNT6lBqpBGljt6Ka3wjWm5LLzhdCcTwvnK0KbrbWB+0XhNrZAA/2gyswWO163qPGHl3+tSsL3rppAo3a7OLxAm7iEDk9K3yK7KeQ7nUpvXQnJaeT16Mkr1lGsb6yJfZCZawLs1O/CJgGqKyVyeXdO8IaQeuOWvmEJGcjRlIgQbqfoZ7sMpNNWYxDvH/COToXUVxfJjZagmpVhEa61X8Rfk+0J6lEqVH0roqBnwYCAX6rImGe8B1njCANe2mYUfcb5SoPBR2RmZWcvn9/9c19FDHVvraZDR+sXhL2hBw+O/YX9+waz0H3Ycyn1bi6wG8kBman1TjOfn5RzvW0LbWHPSUPpNABl8VWNAICo3OjPw0ZepipVE/U9xrXQd77ETUnFvc4hrrH/bLlzGkytEHfa4uVs02p92RVJ6Y5hGrY1nUJZL6/YXwakGdhwxoDZEZ9J3otuA/OksmUF0qUfUgHakT2Ku4ZHXEh9ICguNq4LWbQU0zmhduyjLHEENC+6QTDyFXNdgGrGxlVAx2wqg2BXG7/Zw027X6ZfrbrPtcUVFZFLu1ggVUnft/1Fz/ShIT2q9eI3GtwfXgIk8IrNbVX3i40/Pioi4+0wnmwmqEc/8sCGeVi/aa4pxn7+NksI+kieEf/Ks3gptIVNVfz5trqABaV+qkc49ATGPOyq2E0K1vdsRtknTyxWdoX5d7+DWd98i/4HVtw5E/aji5MGmbM2dcCQm8+34eVxDTfQ==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目配置/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json
index df690e64..a3c4e47f 100644
--- a/Pages/项目/项目首页/项目配置/项目信息.json
+++ b/Pages/项目/项目首页/项目配置/项目信息.json
@@ -287,8 +287,8 @@
"18,1": "0",
"18,8": "0",
"18,15": false,
- "20,1": "工时核定方式",
- "21,1": "计划",
+ "20,1": "工时分配方式",
+ "21,1": 1,
"23,1": "项目方案",
"26,1": "预算方案",
"29,1": "网络资源",
@@ -869,112 +869,95 @@
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
"CommandList": [
{
- "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon",
- "ProcessDefinitionResourceName": "预算申请",
- "ReturnResultName": "发起流程结果"
- },
- {
- "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
- "ConditionAndCommandPairList": [
+ "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon",
+ "ShareCommandContainerRefer": {
+ "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9"
+ },
+ "Params": [
{
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
- "cellLocations": [
- {
- "SerializeProperty": "=项目信息!发起流程结果.TaskExists"
- }
- ]
- },
- "value": "1"
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "PageName": "FGC_任务详情",
- "PassValues": [
- {
- "Source": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目信息!项目ID"
- },
- "TargetCell": {
- "SerializeProperty": "=FGC_任务详情!项目ID"
- }
- }
- ]
+ "ParamReferObject": {
+ "ParamID": "30be91f8-0920-4879-bfdb-73a2443b9f1b",
+ "ShareCommandContainerReferObject": {
+ "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9"
}
- ],
- "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面",
- "ID": "96069396-448b-4a9c-9530-dc13b38b3f0a"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目信息!项目ID"
+ }
}
- ]
+ ],
+ "ResultErrorCodeTo": {
+ "SerializeProperty": "code"
+ },
+ "ResultMessageTo": {
+ "SerializeProperty": "msg"
+ }
}
],
"ToolTip": "增补工时",
"Size": 14,
+ "IsInvisible": true,
"ImagePath": "增加.svg",
"UseCellForeColor": true
- }
+ },
+ "RulesGuidList": [
+ "8b0ef132-4ea9-4190-83e9-fa06a9bd6dd3"
+ ]
},
"17,13": {
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
"CommandList": [
{
- "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon",
- "ProcessDefinitionResourceName": "预算申请",
- "ReturnResultName": "发起流程结果"
- },
- {
- "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
- "ConditionAndCommandPairList": [
+ "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon",
+ "ShareCommandContainerRefer": {
+ "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9"
+ },
+ "Params": [
{
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
- "cellLocations": [
- {
- "SerializeProperty": "=项目信息!发起流程结果.TaskExists"
- }
- ]
- },
- "value": "1"
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "PageName": "FGC_任务详情",
- "PassValues": [
- {
- "Source": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目信息!项目ID"
- },
- "TargetCell": {
- "SerializeProperty": "=FGC_任务详情!项目ID"
- }
- }
- ]
+ "ParamReferObject": {
+ "ParamID": "30be91f8-0920-4879-bfdb-73a2443b9f1b",
+ "ShareCommandContainerReferObject": {
+ "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9"
}
- ],
- "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面",
- "ID": "a525d695-e8f5-4ae0-adcd-18a9d0f9eee3"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目信息!项目ID"
+ }
}
- ]
+ ],
+ "ResultErrorCodeTo": {
+ "SerializeProperty": "code"
+ },
+ "ResultMessageTo": {
+ "SerializeProperty": "msg"
+ }
}
],
"ToolTip": "增补费用",
"Size": 14,
+ "IsInvisible": true,
"ImagePath": "增加.svg",
"UseCellForeColor": true
- }
+ },
+ "RulesGuidList": [
+ "b86e7249-aa30-4c1d-9c20-7cd975817126"
+ ]
},
"17,17": {
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
+ "FunctionName": "info",
+ "Title": "温馨提示",
+ "Message": "开启后，将严格控制工时，不允许超额计划",
+ "BtnText": "知道了"
+ }
+ ],
"ToolTip": "开启后，将严格控制工时，不允许超额计划",
"Size": 14,
"ImagePath": "提示.svg",
@@ -1083,29 +1066,29 @@
"21,1": {
"BindingInfo": {
"TableName": "项目表",
- "ColumnName": "工时核定方式",
- "GUID": "0668cfa2-faca-42fd-996a-349f34bcd39a"
+ "ColumnName": "工时分配方式",
+ "GUID": "92f5c8a0-d042-4179-bbd9-8e3cf8067d8e"
},
"CssName": "singlebox",
"CellType": {
"$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon",
"Style": 3,
- "CellDefaultValue": "计划",
- "Items": [
- {
- "Value": "计划",
- "DisplayValue": "按计划工时"
- },
- {
- "Value": "实际",
- "DisplayValue": "按实际工时"
- }
- ],
+ "CellDefaultValue": 1,
+ "IsBounding": true,
+ "DataSource": "工时分配方式",
+ "ValueColumnBindingInfo": {
+ "TableName": "工时分配方式",
+ "ColumnName": "ID",
+ "GUID": "e81a55a6-0d4f-4006-a943-d321e44be169"
+ },
+ "DisplayColumnBindingInfo": {
+ "TableName": "工时分配方式",
+ "ColumnName": "分配方式",
+ "GUID": "0d7f0e32-1037-4150-b9a8-5c8b2335f4b9"
+ },
"CommandList": []
},
- "DataValidationInfo": {
- "IgnoreBlank": false
- }
+ "DataValidationInfo": {}
},
"24,1": {
"BindingInfo": {
@@ -1287,14 +1270,6 @@
"SerializeProperty": "=项目信息!B16"
}
},
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "工时核定方式",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目信息!B22"
- }
- },
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
"ParamName": "权限",
@@ -1398,7 +1373,7 @@
"ReloadData": true
}
],
- "ID": "655ed7a4-6975-4095-ae65-6f7c7e3f5918"
+ "ID": "482651e3-5e1a-4398-8b03-93f5bf743583"
},
{
"CommandList": [
@@ -1413,7 +1388,7 @@
"BtnText": "知道了"
}
],
- "ID": "8fa716d1-b084-47e1-a89e-90805625e8c8"
+ "ID": "ab85adf3-41f4-4292-b6e2-af8fc812f9ab"
}
]
}
@@ -1932,7 +1907,6 @@
"18,1,1,6",
"18,8,1,6",
"33,18,1,3",
- "21,1,1,20",
"24,1,1,20",
"27,1,1,20",
"12,15,1,6",
@@ -1945,7 +1919,8 @@
"35,8,1,4",
"9,15,1,6",
"9,1,1,13",
- "30,1,1,20"
+ "30,1,1,20",
+ "21,1,1,20"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1972,9 +1947,42 @@
"$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
"Formula": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=IF(项目信息!项目ID>0,1,0)"
+ "SerializeProperty": "=IF(AND(项目信息!项目ID>0,项目信息!$P$19),1,0)"
},
- "GUID": "80882aaf-77a4-42c8-a371-0d9c66111d9c",
+ "Priority": 3,
+ "GUID": "b86e7249-aa30-4c1d-9c20-7cd975817126",
+ "StyleInfo": {
+ "Underline": null,
+ "Strikethrough": null
+ },
+ "IsDisabled": false,
+ "IsInvisible": false,
+ "IsReadOnly": false
+ },
+ {
+ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+ "Formula": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=IF(AND(项目信息!项目ID>0,项目信息!$P$19),1,0)"
+ },
+ "Priority": 2,
+ "GUID": "8b0ef132-4ea9-4190-83e9-fa06a9bd6dd3",
+ "StyleInfo": {
+ "Underline": null,
+ "Strikethrough": null
+ },
+ "IsDisabled": false,
+ "IsInvisible": false,
+ "IsReadOnly": false
+ },
+ {
+ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+ "Formula": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=IF(OR(项目信息!项目ID>0,项目信息!$P$19),1,0)"
+ },
+ "Priority": 1,
+ "GUID": "c6a3b850-e670-401e-87fc-553622e7d5ec",
"StyleInfo": {
"Underline": null,
"Strikethrough": null
@@ -1987,10 +1995,9 @@
"$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
"Formula": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=IF(项目信息!项目ID>0,1,0)"
+ "SerializeProperty": "=IF(OR(项目信息!项目ID>0,项目信息!$P$19),1,0)"
},
- "Priority": 1,
- "GUID": "c6a3b850-e670-401e-87fc-553622e7d5ec",
+ "GUID": "80882aaf-77a4-42c8-a371-0d9c66111d9c",
"StyleInfo": {
"Underline": null,
"Strikethrough": null
@@ -2012,4 +2019,4 @@
"Formula": "项目信息!$B$36"
}
]
-}//E+zt8HyvDYdhYi6Kv7puQ6KVxg0R69DgbLDmJhIyogwuji1BFiz+OOuvbC11rjfM4FdZAMI0oAPYLYaV26G75TNrFG8xeCD+y9nNJ2Y7LgsQ7/AqLHi9g7xAKjs7R5m7csle15v0wd52w81jqJayeIW3gWMIXJkSRfA2aNy2AfuupMd2I26N17/7hiC5JC7VbcTDL+qEcewvW6QiNTfLTmQH3fnK+y0Qy5v+slPzx2k3+UM/j7TWrkYInHfk93+/Kgpu/KAvplXgnZ+VYaqln0vGS3E0qrNqJ5o6fHXv/7HDVkn5nFAsMMPiWT92P/asA/BjsSziSeXoDC89HlebBe0Z1IO8HAZ9AZPtSkrFF4AfCIsTh9YmzCJk8lUJ7+c/a226y1Qyc7OaO+lgr2BkcAlB9if3ZntEUCN/C2RgImEGDlzhY8alLK6arW5A1/JYqWX+XYaA448xKYRyTgKGeECVs7jli1GprF1VCqNtXd8LCMrGMhNbUJhwI7tnX6A5oYTug1lZNGY0xgLyZvnosMFUVuqB/8mdw9V9hy2ecCXEGdbfuOyom1z+SvsGsr/CwRBjSK84uJtqLLXBDe7R43a4LJweQcDfJ33Xn75gFkYEf2lEJitDjqCAC6fJyc2ox7ex8uVizgsx1gyVXZRrf8NYzcMhcOORwCgRzN9VXyLSXH5wXyzYZx8hVyiKeZnFpvEC01VP/zLpzHmasYm38C2OyhXFqMMqQpZhJQ2FSD34EZRuwgK6ijy2HB5lGw3JmuXrQU3ttnCzZZKw49tq6k5d0xAClhZDnChce+MlT0hy9MK1tXqYXTVjTt7F2d8cn4OQQnz8144/4k18WwGIl6Ka3y0EnAXSbhlw+pgQ0Ts9mW/HzazwVkXdb9u06RGp2QtlMs/2ywFpE8lo2u/8pQ==|920
\ No newline at end of file
+}//s4BtXt5a44VRA0TE+h8XzHw4sRyHpL3+Kk5+Lgq6C5+KwOchJ6Somo0Ehy7tsTf4DhOyk/12nu5ogiV0hGXXfHYubGdpQeEKAHXRHqg2B0qFxZOFHDOYifecmDLNiMxloGIWbGdIw3sC5mFvPf9Wmw+b4zgWP8k1X/2MbZkD571bP12GcfbLzxD6ESMfN4sBbPo3ASBYKPOXAMYGXzH8NH+kTpSz3xPA+DrDrjfETUF01AAQYpn4TVwF2CjqYjTBtt2WpiSKqHij0y+1q45mqT2PMBcUUphuwhW6dH7Fa1P7AePBs+zWQlHGNw9xerFH+JfCuGAwRf9rV5SexZrvtOuiN1zBmBTq4DaP0/inEX3/aPJV0lp16lsO7BOV8OlbXoWzwVZHMFcMfHjxx5NjnVsUNGYbrlwgF4YM7HL96Nx7MfLfaZIMSD445Q/NwguEx34OiYTKSCfGZMrN4OikIW24M0VLuBWnsp+2IoMe1VU2xEq0Rq4nAttYINd8MoJxxDtGkZQso0xuRkVvEDdC/hswSTOgbjQhqIi2qlBoyD1NtABREFrDKQqdKCMjpLFbatFkCAIOCpK8lwcTwGP9t2SkdmpSfCwsQBHwXEqW84En+QU163arsAnVlnidfzd1LakrXabUJyHGRDHmqvd1SfwRIaT1BJgRFUM+ZDMzrrpuLbcQgj79aLyJ+gAlw8talYX4uvNyzvvWGyVjj+kx/nDFAgJ3faYYt+vYyVe9r6I4wElsIIKZm1fabVqsdewapD5aLOQZRHI0A2K+zqLsANhnYyi9bPBj9bRcbAr1JAP4PwKIDYjiEB+1QzxtNM0h91zqcEJ5EH8fDRVCjdOZSK7ux/UN8Sc3i+KCAD4muqjae2CzXzIlXJV3I8auqLpJS8Jhi5/H0VQKR9/JSCIVog==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目配置/项目审批.json b/Pages/项目/项目首页/项目配置/项目审批.json
index 40842964..c381ea90 100644
--- a/Pages/项目/项目首页/项目配置/项目审批.json
+++ b/Pages/项目/项目首页/项目配置/项目审批.json
@@ -296,9 +296,9 @@
"7,1": "客户部门：",
"7,12": "客户部门：",
"7,23": "客户联系人：",
- "9,1": "工时核定方式：",
- "9,12": "预算成本：",
- "9,23": "预算费用：",
+ "9,1": "预算成本：",
+ "9,12": "预算费用：",
+ "9,23": "工时分配方式：",
"11,1": "计划开始日期：",
"11,12": "计划完成日期：",
"11,23": "计划工期：",
@@ -417,22 +417,27 @@
"9,5": {
"BindingInfo": {
"TableName": "项目表",
- "ColumnName": "工时核定方式",
- "GUID": "b81bf8ae-e1e3-4874-b2c8-ec27a6256a82"
+ "ColumnName": "项目预算工时",
+ "GUID": "f2ead1e9-1f4f-4f46-8ad0-c7256aec4817"
}
},
"9,16": {
"BindingInfo": {
"TableName": "项目表",
- "ColumnName": "项目预算工时",
- "GUID": "f2ead1e9-1f4f-4f46-8ad0-c7256aec4817"
+ "ColumnName": "项目预算费用",
+ "GUID": "a4520b6b-89cd-49e3-8fe6-b433bcae3f26"
}
},
"9,27": {
"BindingInfo": {
"TableName": "项目表",
- "ColumnName": "项目预算费用",
- "GUID": "a4520b6b-89cd-49e3-8fe6-b433bcae3f26"
+ "ColumnName": "工时分配方式",
+ "GUID": "3b3d4b1f-2a73-41a5-97aa-adde7d537b09",
+ "RelationBinding": {
+ "RelatedTable": "工时分配方式",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "分配方式"
+ }
}
},
"11,5": {
@@ -734,13 +739,22 @@
"9,3": 0,
"9,4": 0,
"9,5": 10,
+ "9,6": 0,
+ "9,7": 0,
+ "9,8": 0,
+ "9,9": 0,
+ "9,10": 0,
"9,11": 0,
"9,12": 12,
"9,13": 0,
"9,14": 0,
"9,15": 0,
"9,16": 10,
- "9,22": 0,
+ "9,17": 0,
+ "9,18": 0,
+ "9,19": 0,
+ "9,20": 0,
+ "9,21": 0,
"9,23": 12,
"9,24": 0,
"9,25": 0,
@@ -905,12 +919,6 @@
"7,27,1,6",
"7,16,1,6",
"7,5,1,6",
- "9,1,1,4",
- "9,12,1,4",
- "9,23,1,4",
- "9,16,1,6",
- "9,27,1,6",
- "9,5,1,6",
"5,27,1,6",
"11,1,1,4",
"11,12,1,4",
@@ -921,7 +929,13 @@
"16,1,1,4",
"16,5,2,28",
"13,5,2,28",
- "11,27,1,6"
+ "11,27,1,6",
+ "9,1,1,4",
+ "9,12,1,4",
+ "9,5,1,6",
+ "9,16,1,6",
+ "9,23,1,4",
+ "9,27,1,6"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -946,4 +960,4 @@
"PaperSize": {},
"Margin": {}
}
-}//3YNgrbzaYeljqxLWhRaNozN2Or+ZisZvyVypQOgzaV0Ivq8vUBNjkZHhgNIlTHBKYqdkD0EF5zOh2LuqOaSLqegkc1vJ2rp9B3P1K5TLs7wFVexO9jt/vee1i7W4dxW+/iLqtZ7dryUaMUzMJLO1WYfOftUZ4NRdtYkaintoNMz/IGZlo+DbmgxgnfOrW4/NK20YXR+Y+iP/E8Mu34WNxrRFfX5PMEQ3nJw6apBKqHMQS7eUMnwwNhMDhzOMfggtSlEQq5LuTpKmk2CMlqRdHLGPEFhofSt+GBdEttx/qxuisMN3gAolg66PMCaELaAcaoCpewugajC9U4Il919tOsT/iijZ5y5jksHRmxbad5z6mBtcWxnsULPybZfFAYkP8z+IlkdLH5dBMEY3kCPM6UxKlQJ6d8rp+kTYEXgkJGsKssYkgVg5rfX0v+X1/INTQzZrCqJQv+HISIyL9D7UFtnlKMlhyyswj8z9U+BDkJWglWH+2Df+mo0Ag6O8vyr30LtdV4Ofu5TGMVtKpAWBOlGQB5EWy4v7pxe1C3MbZK8MPGC+JslcO56xidBioIDWeP30XBOVdYVhIJd0Y7UJ9yC5paXMS8y2iox+291ylfBUyKaG9AWkNCArqfjEyVnyWCejmwN0enI0PTzzvAtbbQY3i8XpbuCcqWz7aXbRiIeUGw5UEjBqFeAgCc6eOnaQN142TgTiUyYXeBaZrLmDq4Y1Q9whTkCRsSvaYyjJJ08frSybSNGDA9gkuHrktGDnaiP+C1RL6GSTBjjJKqFXTz0GNfy25WZ5J5bDQCetoWhHGAVgOJ8bRDjgHZxPcUacYk2w8i2V71YXJgS3+XJSD0TG/KzLZ2etSu6WV3Brj/bRqYUuf9hnXrqWiQ6kqi1OLk2hFvQIsb/0RnsBgfAbHg==|920
\ No newline at end of file
+}//o2CSTM5/5H+zzSB7OW8pyIP3gRUfuEUYlczKLZ4dqnZh3HUrel3INYtA+khw8yxQ2vvYnYLtx1S7CzJ46ewgS/1pd+RJIbAJgmSXW5mgtM0tJzYTepW/R3KT8brIbqAHMUkXWMZ5C/w3IP+ofRfI2zkbOifBEJG3Ua30JegbngUuNAkn+hMc9PU1p3sN4zPVg72flNUxFp93Q3C9vIESu+jdiIfIlqbXXn+bk59AQWFclOnXBfWaMB/ykunAQ9yfZqfn2Koh4WfJw5TGPw1JbcuDWsoEpDzVsvxqfDNEYS4E70cLDfigZU3ZaxHgHpQPtKnT7eeHeWOPKZlGmLKkmCgB7GAWsIJq0LgNDjzSbY/C4T8sZSyPssgp/nfvxfSviGci5V32kSxE6na+QOPTYaOdyGnoxz+3Gtp+U+8agt45Jdkmq0pswu29dHX2bjeaV0+mQM4RaQ+W7vxKYvk8yfGvpDmG6Wn5OB5JrtNjx9PKpg7S4R95IvS6Yolkcui13yzlMLxCmAKHBQukBqd8z93qejqUry43TyKwOj9yIbr2uSRObzgUNw+Wts+axI9d1viNvMLf/mhKYapEnliOcx6YPCTD3erOwHa+zCnbHbaTRqdpPxqTq9I86lGK/k5Uva3YwC3fVwV2LlCBJdK3ZBiCBlq/LKUsG6t5I7/k0X+WLyLIwrjbjhLCKlL8MgEkonctL1jRdBm11O0Dme532f6qXhNM9QYB20poX9EgJcQMmjEJzW0IGk90QGUXiKQQ4SfsXZ7CEMykf6XTXGkI+ERG7dRz1b1/65RyJkr+5O8eBGFdde8n8EJl9l6OA0PCPUncwJPlbJyZhmnEhQh96QiZLQtgoXp2Sjo3JexhSx4nYxSfTyu9ihN1I8DDROmfgx2HvHUh1lWx6LskbuVulw==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json
index cf859086..0a815e43 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目工时.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目工时.json
@@ -405,14 +405,6 @@
"GUID": "02533bb1-24de-4df8-b6a8-6ceec8a1fcc1"
},
"ColumnName": "总实际工时"
- },
- {
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "总核定工时",
- "GUID": "a53312c8-5aa0-4cb1-bcf2-0ff52e4414a0"
- },
- "ColumnName": "总核定工时"
}
],
"SqlCondition": {
@@ -429,10 +421,10 @@
},
"NullFormulaValueQueryPolicy": 0
},
- "ID": "29769ba30a384ed0b866345d2fae554d"
+ "ID": "7ec08c7659044c1eb3765a0157cd522e"
}
],
- "ID": "7f90af58-2d06-4ec3-b929-7f416c9f7594"
+ "ID": "5ce1d29b-7110-4307-9fba-47bd9b83abc0"
},
{
"Condition": {
@@ -482,14 +474,6 @@
"GUID": "d7ec7d6d-9b75-417a-8757-a5de515ea460"
},
"ColumnName": "总实际工时"
- },
- {
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "总核定工时",
- "GUID": "a55760ee-f371-4c28-8c88-55d55e896433"
- },
- "ColumnName": "总核定工时"
}
],
"SqlCondition": {
@@ -506,10 +490,10 @@
},
"NullFormulaValueQueryPolicy": 0
},
- "ID": "088c9d31683644489a5142434a90a00a"
+ "ID": "3f9e7619a1224e33a5068edcf10c1513"
}
],
- "ID": "b59b8c31-84f5-41f0-83dd-f7f163e04a7c"
+ "ID": "4b457be0-7af1-4497-8740-1230da6205cc"
},
{
"Condition": {
@@ -559,14 +543,6 @@
"GUID": "0e51eedc-dab5-4e3f-8ad7-b9d0dd7df5df"
},
"ColumnName": "总实际工时"
- },
- {
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "总核定工时",
- "GUID": "df520f3f-bcab-4504-a8d8-5d3dae914e2a"
- },
- "ColumnName": "总核定工时"
}
],
"SqlCondition": {
@@ -582,10 +558,10 @@
}
}
},
- "ID": "2fa6d81453e44b96895c363539cd8e35"
+ "ID": "85e297e19bdf42fca55dec7468bb8209"
}
],
- "ID": "e3d72de7-ab90-495b-be85-f7a5d855c55d"
+ "ID": "36dd27dd-fb40-433d-b26b-53c378dc9aa8"
}
]
},
@@ -694,29 +670,6 @@
}
}
},
- {
- "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
- "TargetPageElement": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目工时!L4"
- },
- "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
- "MethodName": "SetTableColumnSetting",
- "ParameterValues": {
- "dataColumnName": "总核定工时",
- "columnSetting": {
- "$type": "ElementUI.ColumnSettingBase, ElementUI",
- "label": "总核定工时",
- "formatStr": "0.0",
- "align": "center",
- "headerAlign": "center",
- "filter": true,
- "multipleFilter": true,
- "showOverflowTooltip": true,
- "key": "94ff0a10-99a1-4d26-baf7-7bd7d9d5006d"
- }
- }
- },
{
"$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy",
"FunctionName": "remove",
@@ -1002,4 +955,4 @@
"Formula": "项目工时!$B$6"
}
]
-}//Sw7xjXbhcIWeZplBVx9+1bAftNIMgu8daicF3UleBMKPyQqEYpbDPUhQLR2l6yLs/1yTYljmntUwtZGw+Y+aqJ+6MhqV1EM63ZnNCXbyyOar07d5N6VMjLzADGWcScw7ZTYjKWwDVokri/1Hfgxl7jElisE1L2G7/37b8Qlzw1HAyfOdYJOqdMJj51OVIw8NbLIkpyViIlclSLIRiz5RvDzGzStWA/Rcj1l6FYUmcErYJ71kS5HhbFRAjKBVw6CyCrsqMfhmyILmyBLVp2loqD4xuIGYcmk2KI7eAc3LoXD7oXVgCUqkyzQnvMqHr7Hec0zSkRZnV/9Ub6wrsSkgjc94PBFBvvUEP3sq+wXSHqAsrWvf7tEd4SODIY1KGcXHh5evHYw2YjAk9u676Ivp4dTuNxRTMomt3EV8vQm5KrVguzQIwqgowv4q7lYQkBkDbRcMoO+M46Du3wBkXz8dILW+D+YTQfKyqchhSMebdFtO2oDupsan3jtV+bxtjcxbTN+OA3MUV5mfFFBKZ6/yklj1XsFO5lJZxoy49n4VRIkrE19yGWjCcLyj8Nb72zWWtywgodBdPAIJlnKhdKRxml/GnxhzugEdBO5ruB7mtNDhSEsHD+mwsiUaN0uEAEWWGX87YHZqgWQmMQbGJj2+KqlxES1a1XOkVNfb4zVpSSioi0peBnvtnfthdwGhLgxClIC6ogMb5rBTxSWeALjXpcLkfTvxufhELM/9+qe76gVwBRCXJTSsL/xtOzggU2zNDxLDHiLnzg4nd+35Wvdvv6DwJoM8g+PbSWc4f7K9X/sLd8z2My99Ikfz6gS2M0BGo9bGypGKxKqQf4cvYIb6Q5wi2PleBPUOr6eaD+5nenmtyd1tZPuypStc2elAbRieGFvU33QSI1uLrEMxQbElAQ==|920
\ No newline at end of file
+}//EbTxsSHftDBgqyEo2EdzochDMoqi433C9Yn1ckFY39m7TsQex0GFylshjMKwLFybpw2+SWzap3xikwKU5dgRhec9kHzSjuy0qMDPYljGtlKTvNaaoPf/mYlI4SU77dJppfjUJRZPCfP2L2VfYS5XEKM2PY6LeiG3b+lQvkVObe4n+BTwKJRoJ4SDiJVA3R6vuvjXTHUlVMM4cx4/JurRqAR6TPXqWgd5oP/+4qmT/E9xdxsnWAn+WttWp2nR206EsBlSCVTkJPWDAwYQPvwbaj86/jMxEMQEmt/MWMlGIr3E7Lx5Pt2c+pdLtdAbr00AKnFQY3Vy5Bs/SIMb6gqgWy13oC53hUVtVXv9jqWeVrZa0HlPkSu72sroX6KkNLwCWnC77We5aBjzabpcagQA64eVUeuIIvo93rPYvhCO4i4PxsZPvWOkubdRLfKv0mTZ6GXUvQdksXCDbWsOR/RQIEQnmJev4r8yk8P5haTJshua6QC2r06CjtdHludsLM3+xt4CtY2hdjp9fjuzDVNTc/xFxoKW2PwfqgYNrOCAzm39N6zRy+MFD2kJo51zLoaeNOe/GiWkHsOemebgKwjlLHWFhFmigLZGdOXaZ7k03QSMQdEBgwhiTltLm/0Ki8HB7Gtb2gkNKjSItwZvnKpg1LXGhtMAppfGpqnuUkSEWOiJYKbjDEJVeclsBKH7LVMuOSWUJci2KA2bh+6OreCtHd8FPjh9vCTOom3q0rvs2dTA7pYWN9Wyew3VPAJM1SygR8eMHYLgzIIbo0kqA5xol2kiqgpgEBQIdebjDSQcSg4r0ULRanwwqrTvizvGdM29xNa7MN7YA7K7oDMb/wD4+8HIT179x/ND8aBFeMV30gZheq/MEMvDv4jh2EqMKwgT7asMinG36AUrxy8bA0sgIw==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json
index 20329e37..10a1647a 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目成员.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员.json
@@ -575,7 +575,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "1e37c9b1-65eb-43c9-8c4b-07b0b16f1d9c"
+ "ID": "8984d989-4e45-4577-9c82-c5bdd0b126d1"
},
{
"Condition": {
@@ -650,17 +650,17 @@
"BtnText": "知道了"
}
],
- "ID": "323013d0-3b34-4464-89cb-e981ae57b7da"
+ "ID": "ae8dd166-d55a-4305-9097-7683d71058ee"
}
]
}
],
- "ID": "0d01ee0b-c354-41f0-8eff-eecaf8dcd70d"
+ "ID": "cb03c87e-9b56-42e6-881f-8ccc09079d08"
}
]
}
],
- "ID": "e159eb72-ff6b-4fd3-b7d5-03b027a0d6ae"
+ "ID": "a9d2712c-2039-4eba-9108-cd8f144849c5"
}
]
}
@@ -767,13 +767,6 @@
}
}
},
- "6,1": {
- "BindingInfo": {
- "TableName": "项目表",
- "ColumnName": "工时核定方式",
- "GUID": "d6bd5419-1ac2-4273-b273-2ad756ae5ffb"
- }
- },
"6,5": {
"BindingInfo": {
"TableName": "项目岗位",
@@ -930,7 +923,6 @@
"5,9": 14,
"5,10": 14,
"5,11": 13,
- "6,1": 2,
"6,5": 2,
"6,10": 2
},
@@ -941,7 +933,6 @@
"Spans": [
"1,1,1,9",
"4,1,1,9",
- "6,1,1,4",
"4,12,1,28",
"6,5,1,5",
"1,36,1,4",
@@ -999,13 +990,9 @@
"Margin": {}
},
"CustomNames": [
- {
- "Name": "工时核定方式",
- "Formula": "项目成员!$B$7"
- },
{
"Name": "当前岗位ID",
"Formula": "项目成员!$F$7"
}
]
-}//7yB6qjLPffB3B5JkMteLHCK/aDHtZpoZmAKNObPaEuOU7b1CxWUyZvLgWMwpg+Hespf5VagbVyG9ynTwr2BMvDLZFXlOA7cxnOaiGumywwuSFyd+n6ZXSVYhSVzFPXoAqxzjfP8hOVsNSw3eO5rrLXttwSPDTpWH/CsBg1Z5e625IlTJdA5vRYhObeiTjCmxfyBHCqhPvtnyffHI8ruQl3uQt0VUwRoOk8WCBaCWfTgF61nkZKSjDVfm32Utnb6W7lAiPMGeuBcnlz+kRcmJxY1cM7lDQcEJLZBxyZRajSKn3YzREMPsWFNfEHoHtV8JJuw19QRpl3SrBPonCd92TNPt1yZRibR3l2+BZHF2kgMpRzO5x0O94DAZN/SH4cgVbVfMtGYvtpgGpsjQX2C96IW1wvuLZJOhmiLPSx4X52xyNH7X7TB4kjdRMPpDdqKPmBcdoAbGFVWUAAjPdRvCSc0JZjW4yCNbgefhSRgvJ5/5QOr+ZEHTRFhwH4zFIXzgs6ZvhFLskckZk4sKU5OXuUz79oKxX2uMP6lkG9wLBXX5OuqQ4HEDs9K7rCgvu2gVePDKINWnsaQ/ksHhTuM2YDxyoenSx2TfY0ebFyZdO52HKkXXAcdfapksLVfIXKwsKk6manwnpXQaQ6hH593C6mrQDJf5Avc1SrBiflfAZDm4cbZsKqFk8Cw+mpvc7F5QZfxk7xH3wQmfFhlGUb7BIdukrHKFUTnM3i7H77fd8v4p0dq5jhWx3nYCEHBuCPY9yqL4GweGLkUE+zRmjZ3hQcRqcGy0CGqi4cwhJDuEuoL0tGB0NCJGRJ8hax262ZbBCrCrDqX1OkJ5AM8OwVr5vX7eepI5WKXtaOJVAV6HZ1ySPW7WfLlqRo3Xf8/ZtzkJInjYgjfRjfeAb02m9iiGPQ==|920
\ No newline at end of file
+}//T1HZ3pgGh/b5Njm4FO0pZuiIWEzonN3CWnQa7aw1P8LTmqpmylKlwMmGgz3rw0lA1ouYy6VHkltQtZK1VFgaBz/QvW5Om0BC2sm+ETNUJ0U1rdghsGs1SfPXtc6jvZZJLO14b7b20A09rkL6IG9sM5sA9B4esalhXGm6aQHRzbSobtGRpkATfJmq0auG7QdVeDWTpzAwtd8FSGsGVSYyh2+TAC2xKg4cnSMMIoLfHn3RKqsPhavwXs+gWoU8Jc2MWimdpuiWKcS+TsnDClbMTfwWqH/1v2V9Oy2lz7fabp7KIizIUYVFE9pdAF9yCQTxE3Kvzlp6wM41Hjcjx5M9Ufu48//RNR/qE8nyEcPwC6l9vOb+7lfUXJpRd82ybWhQRQe+XmKA199C54ifeF4ZQhOsPp/pFC8hiYlYUmQgNZ6TDVdTr/WQPU3U/9bTSSAWOV5KLdbNdRV4c/0knjPsxppdtNhpOFVt7Ljv627gwfekUAH9jSsxnxhPP8ui//6eRVuiA/4UJciBfoAccfgO9fAe07y95AyvOQdFoapSofDwWi33rCBbEx5Ro46T1iETHX44JPdfVNlBNI6PWyrzEOE2JzmxTEAfM66YJeNFRRI9z6tTbB/bWbPbx7zqddE4lsxmYSNzgQ59AQiQZYBQ6rp+9R88XgqHGCO+KMYqEHPam+/98Z2LYhXN1WJITNuSQkQl7v9PgFp5aSH+y90bELTrZOm2n2UyhzbFMPkG1rtzpB2g6m4JFjK1hVEYEN1j2WnQCfnKtH1C4dJIoZ6NBgq17K/evdaOwpL/OAG78HJHRfjo7roxwWL6JxWGxDOu0tXfVvmH+BgD7pka7ciS+8XF8EdeTekmz2S/1IA6Q/WUoeV1HyW8j392urBdOedJV3edNSnqwoj7SRRHvOv0Sg==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd b/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd
index df8eee82..686590ed 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员.rd
@@ -3,10 +3,6 @@
"ColumnCount": 41,
"RowCount": 7,
"CustomNames": [
- {
- "Name": "工时核定方式",
- "Formula": "项目成员!$B$7"
- },
{
"Name": "当前岗位ID",
"Formula": "项目成员!$F$7"
diff --git a/Pages/项目/项目首页/预算申请/项目预算申请历史.json b/Pages/项目/项目首页/预算申请/项目预算申请历史.json
new file mode 100644
index 00000000..a245082d
--- /dev/null
+++ b/Pages/项目/项目首页/预算申请/项目预算申请历史.json
@@ -0,0 +1,517 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 415.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 41.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 7
+ ],
+ "Count": 8,
+ "DefaultSize": 32.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "8": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "10": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "11": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "12": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "13": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "26": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "27": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "28": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "29": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "30": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "31": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "32": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "33": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "34": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "35": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "36": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "37": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "38": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ }
+ },
+ "Count": 39,
+ "DefaultSize": 32.0
+ },
+ "Values": {
+ "1,1": "%PageTitle%",
+ "1,35": "新增申请"
+ },
+ "AttachInfos": {
+ "1,35": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon",
+ "ShareCommandContainerRefer": {
+ "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9"
+ },
+ "Params": [
+ {
+ "ParamReferObject": {
+ "ParamID": "30be91f8-0920-4879-bfdb-73a2443b9f1b",
+ "ShareCommandContainerReferObject": {
+ "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9"
+ }
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目预算申请历史!项目ID"
+ }
+ }
+ ]
+ }
+ ],
+ "Text": "新增申请",
+ "TemplateKey": "_RS_Main1",
+ "Icon": {
+ "Name": "Application/001_add_1.svg",
+ "BuiltIn": true,
+ "Color": "Background 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
+ }
+ },
+ "3,1": {
+ "CellType": {
+ "$type": "ElementUI.TableCellType, ElementUI",
+ "ElTableName": "EL表格1",
+ "bindingOptions": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "项目预算变动表",
+ "BindingInfos": [
+ {
+ "BindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "ID",
+ "GUID": "c8ffb160-23b5-4712-a034-4b80174c20e4"
+ },
+ "ColumnName": "ID"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "申请人",
+ "GUID": "8093fb78-52ac-429e-91f4-ea566df15d16",
+ "AttachType": {
+ "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+ "UserColumnAttachType": 1
+ }
+ },
+ "ColumnName": "申请人"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "增加工时",
+ "GUID": "09f9c31e-f28e-4cb5-a4b5-ecd2f274cddb"
+ },
+ "ColumnName": "增加工时"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "增加后工时",
+ "GUID": "f26fef30-8d5f-4857-80eb-82b9550103f2"
+ },
+ "ColumnName": "增加后工时"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "增加费用",
+ "GUID": "cb60c0c9-5774-481b-b55f-bd08a58277f5"
+ },
+ "ColumnName": "增加费用"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "增加后费用",
+ "GUID": "04070871-9712-4c5e-b43b-3179a24605a4"
+ },
+ "ColumnName": "增加后费用"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "申请理由",
+ "GUID": "f0b781be-5919-4fae-9fce-4b7bf466ac34"
+ },
+ "ColumnName": "申请理由"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "描述",
+ "GUID": "1df33a14-8678-4f83-b79b-9dd90b24ad71"
+ },
+ "ColumnName": "描述"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "状态",
+ "GUID": "73b72de3-3ae4-4a9c-9ec6-a89dd6472437"
+ },
+ "ColumnName": "状态"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "流程实例ID",
+ "GUID": "c507269b-8f09-4282-8a10-0611803da44a"
+ },
+ "ColumnName": "流程实例ID"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "项目ID",
+ "GUID": "ca89ac33-f222-4a64-9b5b-afc7c01fe020"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目预算申请历史!项目ID"
+ }
+ },
+ "OrderBySqlCondition": {
+ "OrderByColumns": [
+ {
+ "ColumnBindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "FGC_CreateDate",
+ "GUID": "2d006cf9-bc9e-464a-8711-515cd49c8e21"
+ },
+ "Order": 1
+ }
+ ]
+ },
+ "CustomColumns": []
+ },
+ "columns": [],
+ "showActionButtons": true,
+ "actionButtons": [
+ {
+ "$type": "ElementUI.ActionButton, ElementUI",
+ "type": "button",
+ "Name": "查看",
+ "shape": "default",
+ "Commands": {
+ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
+ "Commands": [
+ {
+ "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+ "CurrentRowInfo": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "ACT_HI_TASKINST_View",
+ "ColumnName": "PROC_INST_ID_",
+ "GUID": "2d2f5699-d309-4756-b7d0-54c8ddc16403"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目预算申请历史!行数据.流程实例ID"
+ }
+ }
+ },
+ {
+ "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+ "CurrentRowInfo": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目预算变动表",
+ "ColumnName": "ID",
+ "GUID": "4b667a07-2c6a-4ebc-835d-3ecc73ba75ab"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目预算申请历史!行数据.ID"
+ }
+ }
+ },
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PageName": "预算申请",
+ "LoadBindingDataOption": 1
+ }
+ ],
+ "ParamProperties": {
+ "dataRow": "行数据"
+ }
+ }
+ }
+ ],
+ "sumText": "合计",
+ "size": "small",
+ "showIndexColumn": true
+ }
+ },
+ "5,1": {
+ "CellType": {
+ "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI",
+ "ElementTableName": "EL表格1",
+ "pageSize": 15,
+ "pagerCount": 7,
+ "layout": [
+ {
+ "layoutItem": "prev"
+ },
+ {
+ "layoutItem": "pager"
+ },
+ {
+ "layoutItem": "next"
+ },
+ {
+ "layoutItem": "jumper"
+ },
+ {
+ "layoutItem": "->"
+ },
+ {
+ "layoutItem": "total"
+ }
+ ],
+ "pageSizes": [
+ {},
+ {
+ "value": 20
+ },
+ {
+ "value": 30
+ },
+ {
+ "value": 40
+ },
+ {
+ "value": 50
+ },
+ {
+ "value": 100
+ }
+ ]
+ }
+ },
+ "7,1": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "ID",
+ "GUID": "6acb93a3-d8b4-4b69-a749-e483253ef0f1"
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontSize": 18.666666666666664
+ },
+ {
+ "FontSize": 13.333333333333332
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Body"
+ ]
+ },
+ "CellStyles": {
+ "1,1": 0,
+ "1,35": 1
+ },
+ "SheetStyle": {
+ "FontFamily": 0
+ }
+ },
+ "Spans": [
+ "3,1,1,37",
+ "5,1,1,37",
+ "7,1,1,4",
+ "1,35,1,3"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "Title": "项目预算申请历史",
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ }
+ ]
+ },
+ "RowBreakLines": [],
+ "RepeatRangeSettings": []
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ },
+ "CustomNames": [
+ {
+ "Name": "项目ID",
+ "Formula": "项目预算申请历史!$B$8"
+ }
+ ]
+}//SHaklXWQpgh6pepG8uMpUtCzP0xRK9HGwRZnBkzN3sMVIS2ETtvzOTFmOv2Pf39lm3cOGRxjVeoZSGgnOCrIXAGR3xncpMW5vzDGISGWlTCndaZYL7j2nzESm6EoqyPbPOFsBXweTRz+o8pCuSF2bgLICjxCze0nQEGNeIpwxSgmlpvheruPgInsqE9vEKPZQcJ0yf++6buBZTwXgXS4OCi4/L+opa1U3xNEtdOKaU6VLpNWRNgxNDe46cHiaM+yuVBnFi1qPfUy0I1niQ+i0F9yrfmxplJqnex7wRv6rrcMvgZQgI7vJimpD5Ul31RP4KHi+txneeHxEhy0l+mhu3Ao18KokISj9tJ8bGJsI9x+o5rHx6f5AA7TASlzMSHAVf+G6yOcB1ngpcLFZfR1TyUCsdRd/2T1dUF80QOJ7ZAUWbWPhha6UDWkLsoT/1N2DDixl0Db4xwFzB71mu4NrEwyrLwDHFK/Yq/hQWdS5WmGiJT9/MK22LIyQ79BqSS9BuJEqunJ3ZPZd/YqnflGrZq9/PPoEYBeHh9MacH5SeKpSlMCua7OgK4i9Kg1+z/2XjCHIrL8gyZgpnPQkrACofGLWXS4h34Nqglw9W57a6kQIvHfjIzweMU1pBycLWAng/KshDXrbCbmc7H//3jT7XZNzK7oLFivMNCH3NyLvukTZWn/6I7g2GJl0JZ25P1DHEqST8czWQ+oCtB8+45+2UkCBDpKOR/o7Bpz17WreMkFiYxCaHG+tNYiSnV8bmACnh/7eFxLcQbgCa+8nIptofDedgc6B7oeV5sZWKspb4t9Vp6rZnhj8s3+DmsXAjaVMn6KHSF8/SxTksIiBiBirjjEZtGhjDWmK1P3Oxl4zXips/D9xsqkp8SH+kzqJMhkCF2PHtF++hLdVTY4Skf4yQ==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/预算申请/项目预算申请历史.rd b/Pages/项目/项目首页/预算申请/项目预算申请历史.rd
new file mode 100644
index 00000000..3efafb7a
--- /dev/null
+++ b/Pages/项目/项目首页/预算申请/项目预算申请历史.rd
@@ -0,0 +1,11 @@
+{
+ "PageType": 0,
+ "ColumnCount": 39,
+ "RowCount": 8,
+ "CustomNames": [
+ {
+ "Name": "项目ID",
+ "Formula": "项目预算申请历史!$B$8"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Reports/工时报表.json b/Reports/工时报表.json
index a85f93a7..e1eb8268 100644
--- a/Reports/工时报表.json
+++ b/Reports/工时报表.json
@@ -49,14 +49,6 @@
},
"ColumnName": "任务"
},
- {
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "核定工时",
- "GUID": "f01379bf-61f7-4c3a-bbd9-b874900f0ae4"
- },
- "ColumnName": "核定工时"
- },
{
"BindingInfo": {
"TableName": "View_任务工时统计",
@@ -72,7 +64,6 @@
"string",
"string",
"string",
- "number",
"number"
]
}
diff --git a/Reports/工时报表.rdlx b/Reports/工时报表.rdlx
index 930b0287..da294d4e 100644
--- a/Reports/工时报表.rdlx
+++ b/Reports/工时报表.rdlx
@@ -1 +1 @@
-工时报表.rdlx3.75cm0cm0cm4.001cm1.5cmDimGraytrue用户名20cm0cm5.001cm1.5cmDimGraytrue项目22cm2cm2.5cm2.5cm1cm0cm0cm2cm1cmDimGraytrue核定工时=Sum(Fields.Item("核定工时").Value)0cm0cm2cm1cmDimGraytrue计算提成=Sum(Fields.Item("计算提成").Value)0cm0cm2.5cm1cmDimGraytrue=Sum(Fields.Item("核定工时").Value)0cm0cm2.5cm1cmDimGraytrue=Sum(Fields.Item("计算提成").Value)0.75cm0cm0cm2cm0.75cmDimGraytrue=Sum(Fields.Item("核定工时").Value)0cm0cm2cm0.75cmDimGraytrue=Sum(Fields.Item("计算提成").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("核定工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("计算提成").Value)=Fields!日期.ValueAscending=Fields!日期.Value0.75cm0cm0cm4cm0.75cmDimGraytrue日期=Fields.Item("日期").Value0.75cm0cm0cm2cm0.75cmDimGraytrue核定工时0.75cm0cm0cm2cm0.75cmDimGraytrue计算提成0.75cm0cm0cm5cm0.75cmDimGraytrue汇总0.75cm0cm0cm2.5cm0.75cmDimGraytrue核定工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue计算提成=Fields!用户名.ValueAscending=Fields!用户名.Value4.001cm0cm0cm4.001cm1cmDimGraytrue用户名=Fields.Item("成员").ValueTrue=Fields!项目.Value5.001cm0cm0cm5.001cm1cmDimGraytrue项目=Fields!项目.Value文本框24.001cm0cm0cm4.001cm0.75cmDimGraytrue汇总5.001cm0cm0cm5.001cm0.75cmDimGraytruetrue0.5cm0.499cm18.002cm3.25cm2WizardModel{"layoutOptions":{"totals":{"totalsForRowGroups":true,"subtotalsForRowGroups":false,"totalsForColumnGroups":true,"subtotalsForColumnGroups":false,"showTotalsBeforeGroup":false},"features":{"expandCollapseGroups":true,"collapsedGroups":false,"enableUserSort":false,"steppedRowGroups":false,"showValuesAsRows":false}},"columnHierarchy":[{"group":{"name":"矩表1_日期_分组","field":{"name":"日期","expr":"=Fields!日期.Value"},"sorting":{"value":"=Fields!日期.Value","direction":"Ascending"},"itemName":"文本框1","itemValue":"=Fields.Item(\"日期\").Value","format":"d"},"children":[],"startBodyIndex":0,"endBodyIndex":1}],"rowHierarchy":[{"group":{"name":"矩表1_用户名_分组","field":{"name":"用户名","expr":"=Fields!用户名.Value"},"sorting":{"value":"=Fields!用户名.Value","direction":"Ascending"},"itemName":"文本框2","itemValue":"=Fields.Item(\"成员\").Value","format":""},"children":[{"group":{"name":"矩表1_项目_分组","field":{"name":"项目","expr":"=Fields!项目.Value"},"sorting":null,"itemName":"文本框6","itemValue":"=Fields!项目.Value","format":""},"children":[],"startBodyIndex":0,"endBodyIndex":0}],"startBodyIndex":null,"endBodyIndex":null}],"body":[[{"itemName":"文本框4","field":{"name":"核定工时","expr":"=Sum(Fields.Item(\"核定工时\").Value)"},"aggregate":"Sum","format":""},{"itemName":"文本框5","field":{"name":"计算提成","expr":"=Sum(Fields.Item(\"计算提成\").Value)"},"aggregate":"Sum","format":""}]]}工时表_DataSet1cm1cm29.7cm42cm1cm1cm18.501cmjsondoc=http://localhost:40013/Forguncy/ARDataSource/GetDataSource/eaf0055e-b7c7-4fd9-9f79-abb67577832d;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"成员":{"type":"string"},"项目":{"type":"string"},"任务":{"type":"string"},"核定工时":{"type":"number"},"计算提成":{"type":"number"}}}}JSON日期成员项目任务核定工时计算提成$.[*]工时表DisplayTypeGalleySizeTypeFitToPagePaperOrientationLandscapeParametersView{"controls":[{"left":15,"top":15,"width":275,"height":60,"control":{"type":"date-range","binding":["",""],"maxRange":["none"],"viewMode":"default","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}}]}DefaultTheme.rdlx-theme
\ No newline at end of file
+工时报表.rdlx3.75cm0cm0cm4.001cm1.5cmDimGraytrue用户名20cm0cm5.001cm1.5cmDimGraytrue项目22cm2cm2.5cm2.5cm1cm0cm0cm2cm1cmDimGraytrue核定工时=Sum(Fields.Item("核定工时").Value)0cm0cm2cm1cmDimGraytrue计算提成=Sum(Fields.Item("计算提成").Value)0cm0cm2.5cm1cmDimGraytrue=Sum(Fields.Item("核定工时").Value)0cm0cm2.5cm1cmDimGraytrue=Sum(Fields.Item("计算提成").Value)0.75cm0cm0cm2cm0.75cmDimGraytrue=Sum(Fields.Item("核定工时").Value)0cm0cm2cm0.75cmDimGraytrue=Sum(Fields.Item("计算提成").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("核定工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("计算提成").Value)=Fields!日期.ValueAscending=Fields!日期.Value0.75cm0cm0cm4cm0.75cmDimGraytrue日期=Fields.Item("日期").Value0.75cm0cm0cm2cm0.75cmDimGraytrue核定工时0.75cm0cm0cm2cm0.75cmDimGraytrue计算提成0.75cm0cm0cm5cm0.75cmDimGraytrue汇总0.75cm0cm0cm2.5cm0.75cmDimGraytrue核定工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue计算提成=Fields!用户名.ValueAscending=Fields!用户名.Value4.001cm0cm0cm4.001cm1cmDimGraytrue用户名=Fields.Item("成员").ValueTrue=Fields!项目.Value5.001cm0cm0cm5.001cm1cmDimGraytrue项目=Fields.Item("项目").Value文本框24.001cm0cm0cm4.001cm0.75cmDimGraytrue汇总5.001cm0cm0cm5.001cm0.75cmDimGraytruetrue0.5cm0.499cm18.002cm3.25cm2WizardModel{"layoutOptions":{"totals":{"totalsForRowGroups":true,"subtotalsForRowGroups":false,"totalsForColumnGroups":true,"subtotalsForColumnGroups":false,"showTotalsBeforeGroup":false},"features":{"expandCollapseGroups":true,"collapsedGroups":false,"enableUserSort":false,"steppedRowGroups":false,"showValuesAsRows":false}},"columnHierarchy":[{"group":{"name":"矩表1_日期_分组","field":{"name":"日期","expr":"=Fields!日期.Value"},"sorting":{"value":"=Fields!日期.Value","direction":"Ascending"},"itemName":"文本框1","itemValue":"=Fields.Item(\"日期\").Value","format":"d"},"children":[],"startBodyIndex":0,"endBodyIndex":1}],"rowHierarchy":[{"group":{"name":"矩表1_用户名_分组","field":{"name":"用户名","expr":"=Fields!用户名.Value"},"sorting":{"value":"=Fields!用户名.Value","direction":"Ascending"},"itemName":"文本框2","itemValue":"=Fields.Item(\"成员\").Value","format":""},"children":[{"group":{"name":"矩表1_项目_分组","field":{"name":"项目","expr":"=Fields!项目.Value"},"sorting":null,"itemName":"文本框6","itemValue":"=Fields!项目.Value","format":""},"children":[],"startBodyIndex":0,"endBodyIndex":0}],"startBodyIndex":null,"endBodyIndex":null}],"body":[[{"itemName":"文本框4","field":{"name":"核定工时","expr":"=Sum(Fields.Item(\"核定工时\").Value)"},"aggregate":"Sum","format":""},{"itemName":"文本框5","field":{"name":"计算提成","expr":"=Sum(Fields.Item(\"计算提成\").Value)"},"aggregate":"Sum","format":""}]]}工时表_DataSet1cm1cm29.7cm42cm1cm1cm18.501cmjsondoc=http://localhost:40013/Forguncy/ARDataSource/GetDataSource/eaf0055e-b7c7-4fd9-9f79-abb67577832d;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"成员":{"type":"string"},"项目":{"type":"string"},"任务":{"type":"string"},"计算提成":{"type":"number"}}}}JSON日期成员项目任务计算提成$.[*]工时表DisplayTypeGalleySizeTypeFitToPagePaperOrientationLandscapeParametersView{"controls":[{"left":15,"top":15,"width":275,"height":60,"control":{"type":"date-range","binding":["",""],"maxRange":["none"],"viewMode":"default","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}}]}DefaultTheme.rdlx-theme
\ No newline at end of file
diff --git a/ServerCommands/任务/修改任务预算工时.json b/ServerCommands/任务/修改任务预算工时.json
index aa250702..09d8720e 100644
--- a/ServerCommands/任务/修改任务预算工时.json
+++ b/ServerCommands/任务/修改任务预算工时.json
@@ -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"
}
]
}
diff --git a/ServerCommands/任务/新增任务.json b/ServerCommands/任务/新增任务.json
index cfd61171..757ac99a 100644
--- a/ServerCommands/任务/新增任务.json
+++ b/ServerCommands/任务/新增任务.json
@@ -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"
}
]
}
diff --git a/ServerCommands/工时/新增工时.json b/ServerCommands/工时/新增工时.json
index eb8723ce..7339a9d9 100644
--- a/ServerCommands/工时/新增工时.json
+++ b/ServerCommands/工时/新增工时.json
@@ -178,7 +178,7 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
- "ID": "565209b7bd154c90b096249545dfa352"
+ "ID": "0a5d5118ccfd4fee8c6c1a68d603f940"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -241,7 +241,7 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
- "ID": "99e42cdcf1d74dc2aa15b8fadb9d87e5"
+ "ID": "1d2f8e887f994e8582168d092f010ec9"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -379,6 +379,19 @@
"GUID": "8505a216-3aee-4056-affe-6c760e35c844"
},
"ColumnName": "总实际工时"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "b5020b4b-8e2e-4b31-a2ac-53ca31b14b8e",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "工时分配方式"
+ }
+ },
+ "ColumnName": "工时分配方式"
}
],
"SqlCondition": {
@@ -396,244 +409,16 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
- "ID": "a9121deede5e47809d0a7e3a37a1befc"
- },
- {
- "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
- "ConditionAndCommandPairList": [
- {
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=指定时薪单价"
- }
- },
- "value": "%Null%"
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
- "ConditionAndCommandPairList": [
- {
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务成员.任务成员时薪"
- }
- },
- "value": "%Null%",
- "compareType": 1
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "计算时薪",
- "ParameterValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务成员.任务默认时薪"
- },
- "ID": "068f4611d05f4d0f8c97425c44bea1f0"
- },
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "时薪计算来源",
- "ParameterValue": "任务成员时薪",
- "ID": "59b966a6d5e042b79fba6d9e1f659758"
- }
- ],
- "ID": "e82fc3fd-1f12-4671-a8db-c281d9a508d6"
- },
- {
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务成员.任务岗位时薪"
- }
- },
- "value": "%Null%",
- "compareType": 1
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "计算时薪",
- "ParameterValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务成员.岗位默认时薪"
- },
- "ID": "c661840bf7dd4209b486efc6b9eebf59"
- },
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "时薪计算来源",
- "ParameterValue": "任务岗位时薪",
- "ID": "05df8d3ef9fa454b8ec03882ddda515f"
- }
- ],
- "ID": "beacabcf-3bb9-4323-bbf4-a7fae4f5ba83"
- },
- {
- "Condition": {
- "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
- "SubConditions": [
- {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员"
- }
- },
- "value": "%Null%",
- "compareType": 1
- },
- {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员.项目成员时薪"
- }
- },
- "value": "%Null%",
- "compareType": 1
- }
- ]
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "计算时薪",
- "ParameterValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员.项目成员时薪"
- },
- "ID": "3c9b1a387c9942f68be78e905f6efe7f"
- },
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "时薪计算来源",
- "ParameterValue": "项目成员时薪",
- "ID": "25ff3a82fd57430b94e16b296b77c513"
- }
- ],
- "ID": "21f7227a-17fb-4cbb-a041-e28ee5e26b34"
- },
- {
- "Condition": {
- "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
- "SubConditions": [
- {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员"
- }
- },
- "value": "%Null%",
- "compareType": 1
- },
- {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员.项目岗位时薪"
- }
- },
- "value": "%Null%",
- "compareType": 1
- }
- ]
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "计算时薪",
- "ParameterValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员.项目岗位时薪"
- },
- "ID": "7851dbe270c34767aeeb95f619c1f52b"
- },
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "时薪计算来源",
- "ParameterValue": "项目岗位时薪",
- "ID": "22bb1104b90b4467b078e638f3f4aa51"
- }
- ],
- "ID": "cfaf4dbf-85a9-4bd8-afbc-b133edf12a79"
- },
- {
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "计算时薪",
- "ParameterValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务成员.参与人默认时薪"
- },
- "ID": "ca126f12d798410491c2eae2674f0ec6"
- },
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "时薪计算来源",
- "ParameterValue": "用户默认时薪",
- "ID": "fd64e93a07ae4ca2820422202ad6e7a4"
- }
- ],
- "ID": "323a99c1-f431-4171-adf2-bd1011494ea2"
- }
- ]
- }
- ],
- "ID": "4a4bd5f5-6079-4b28-b3e2-95aaa77a2972"
- },
- {
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "计算时薪",
- "ParameterValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=指定时薪单价"
- },
- "ID": "f2849da5adc443fb92b3dbb9bb1779fb"
- },
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "时薪计算来源",
- "ParameterValue": "特殊指定",
- "ID": "a8b2f1ff8b9c4519b5e80575c9550bed"
- }
- ],
- "ID": "d998a80f-60c4-4412-ae82-9a3353b0fe0e"
- }
- ]
+ "ID": "61bdec787f01462093f359a61c71a486"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "预测本次产生成本",
+ "ParameterName": "提成系数",
"ParameterValue": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)"
+ "SerializeProperty": "=任务信息.提成系数"
},
- "ID": "1663c0564426454cb4d8f6337bec5d02"
+ "ID": "197d3beb51834211a7661c4a22538a0c"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -661,77 +446,12 @@
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
"ParamObject": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务信息.严格模式"
+ "SerializeProperty": "=工时类型"
}
},
- "value": "1"
+ "value": "实际"
},
"CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "项目统计信息",
- "TableValue": {
- "TableName": "View_项目统计信息",
- "TableValueType": 1,
- "BindingInfos": [
- {
- "BindingInfo": {
- "TableName": "View_项目统计信息",
- "ColumnName": "工时核定方式",
- "GUID": "b31caaa2-8cbc-4f56-8e9e-0597c91d89da"
- },
- "ColumnName": "工时核定方式"
- },
- {
- "BindingInfo": {
- "TableName": "View_项目统计信息",
- "ColumnName": "项目预算费用",
- "GUID": "1f23c586-e318-41f8-9e2c-f9fc47949199"
- },
- "ColumnName": "项目预算费用"
- },
- {
- "BindingInfo": {
- "TableName": "View_项目统计信息",
- "ColumnName": "项目预算工时",
- "GUID": "45110ee2-aa57-4a49-bea6-a94586f164ba"
- },
- "ColumnName": "项目预算工时"
- },
- {
- "BindingInfo": {
- "TableName": "View_项目统计信息",
- "ColumnName": "总核定工时",
- "GUID": "a4773f83-2817-4be0-9e7d-4b5b3cd36ed5"
- },
- "ColumnName": "总核定工时"
- },
- {
- "BindingInfo": {
- "TableName": "View_项目统计信息",
- "ColumnName": "总成本",
- "GUID": "7c3a493f-d2ac-49b3-957f-7a772d5138bf"
- },
- "ColumnName": "总成本"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "View_项目统计信息",
- "ColumnName": "项目ID",
- "GUID": "0aa2d908-82fb-4233-a1e8-eb5a36cecaa2"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务信息.项目ID"
- }
- },
- "TopCount": "1"
- },
- "ID": "8f20e26c0c7f468f93fd1112fda69cb7",
- "Comments": "从视图统计项目的信息"
- },
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
"ConditionAndCommandPairList": [
@@ -742,13 +462,10 @@
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
"ParamObject": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目统计信息.工时核定方式"
+ "SerializeProperty": "=指定时薪单价"
}
},
- "value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务信息.工时核定方式"
- }
+ "value": "%Null%"
},
"CommandList": [
{
@@ -761,101 +478,371 @@
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
"ParamObject": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目统计信息.总核定工时+工时数"
+ "SerializeProperty": "=任务成员.任务成员时薪"
}
},
- "value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目统计信息.项目预算工时"
- },
- "compareType": 2
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": "400",
- "Message": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=\"项目工时预算不足，请申请预算后提交！\""
- }
- }
- ],
- "Comments": "如果加上本次提交的工时>预算的工时，则拦截",
- "ID": "518a9271-6e46-4a9a-9b18-41f4bf2a7a31"
- },
- {
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=预测本次产生成本"
- }
- },
- "value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目统计信息.项目预算费用"
- },
- "compareType": 2
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": "400",
- "Message": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=\"项目费用预算不足，请申请预算后提交！\""
- }
- }
- ],
- "Comments": "先算出本次提交产生的成本，如果>预算的费用，则拦截",
- "ID": "4109f03a-956f-422b-be68-13d8edf1f4c7"
- },
- {
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务信息.任务预算工时"
- }
- },
- "value": "0",
- "compareType": 2
+ "value": "%Null%",
+ "compareType": 1
},
"CommandList": [
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "任务统计信息",
- "TableValue": {
+ "ParameterName": "计算时薪",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务成员.任务默认时薪"
+ },
+ "ID": "068f4611d05f4d0f8c97425c44bea1f0"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "时薪计算来源",
+ "ParameterValue": "任务成员时薪",
+ "ID": "59b966a6d5e042b79fba6d9e1f659758"
+ }
+ ],
+ "ID": "54a09784-5bf4-4d29-9566-cb9a687aad4a"
+ },
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务成员.任务岗位时薪"
+ }
+ },
+ "value": "%Null%",
+ "compareType": 1
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "计算时薪",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务成员.岗位默认时薪"
+ },
+ "ID": "9cae0ca147fd4f36bf12d59e368f2c57"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "时薪计算来源",
+ "ParameterValue": "任务岗位时薪",
+ "ID": "05df8d3ef9fa454b8ec03882ddda515f"
+ }
+ ],
+ "ID": "c05b29d9-66c2-43ff-8150-87ca39602894"
+ },
+ {
+ "Condition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目成员"
+ }
+ },
+ "value": "%Null%",
+ "compareType": 1
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目成员.项目成员时薪"
+ }
+ },
+ "value": "%Null%",
+ "compareType": 1
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "计算时薪",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目成员.项目成员时薪"
+ },
+ "ID": "8cf0a96476814aa489e3e46860a6e39d"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "时薪计算来源",
+ "ParameterValue": "项目成员时薪",
+ "ID": "25ff3a82fd57430b94e16b296b77c513"
+ }
+ ],
+ "ID": "a36db835-d9c8-4599-9a9d-063786bdf682"
+ },
+ {
+ "Condition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目成员"
+ }
+ },
+ "value": "%Null%",
+ "compareType": 1
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目成员.项目岗位时薪"
+ }
+ },
+ "value": "%Null%",
+ "compareType": 1
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "计算时薪",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目成员.项目岗位时薪"
+ },
+ "ID": "7656d9a836d942e092139516a992880e"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "时薪计算来源",
+ "ParameterValue": "项目岗位时薪",
+ "ID": "22bb1104b90b4467b078e638f3f4aa51"
+ }
+ ],
+ "ID": "9231fdab-3dc7-4e78-840f-22d7914dcbd3"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "计算时薪",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务成员.参与人默认时薪"
+ },
+ "ID": "b5dd3212338449fc8f5aed3c3b6b3993"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "时薪计算来源",
+ "ParameterValue": "用户默认时薪",
+ "ID": "fd64e93a07ae4ca2820422202ad6e7a4"
+ }
+ ],
+ "ID": "512952ad-78b9-4c0a-9503-725487cc3946"
+ }
+ ]
+ }
+ ],
+ "Comments": "优先使用手动指定的提成金额",
+ "ID": "d45a9dd1-71ee-4a94-bff2-83627039f241"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "计算时薪",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=指定时薪单价"
+ },
+ "ID": "ca05817f6d1e4396b90dbdf80186e656"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "时薪计算来源",
+ "ParameterValue": "特殊指定",
+ "ID": "3045dcff1e074a13b95874e71352f376"
+ }
+ ],
+ "ID": "694f29d1-9987-4592-903a-54364a933a82"
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "预测本次产生成本",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目统计信息.总成本+(计算时薪*工时数*任务信息.提成系数)"
+ },
+ "ID": "5f700f888c0044f0926c904ef2334c13"
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务信息.严格模式"
+ }
+ },
+ "value": "1"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "个人工时情况",
+ "TableValue": {
+ "TableName": "View_任务工时统计",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "BindingInfo": {
+ "TableName": "View_任务工时统计",
+ "ColumnName": "任务ID",
+ "GUID": "976cf4f1-2ec3-4537-8ca8-aac1d965131e"
+ },
+ "ColumnName": "任务ID"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "View_任务工时统计",
+ "ColumnName": "总计划工时",
+ "GUID": "37b1cd46-749c-4870-9e65-639974e237b4"
+ },
+ "ColumnName": "总计划工时"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "View_任务工时统计",
+ "ColumnName": "总实际工时",
+ "GUID": "58613864-7f3d-4ab2-9b2e-f1e1b7a86879"
+ },
+ "ColumnName": "总实际工时"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
"TableName": "View_任务工时统计",
+ "ColumnName": "任务ID",
+ "GUID": "b732175b-c55c-4a15-b703-223f45ab07a1"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务ID"
+ }
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "View_任务工时统计",
+ "ColumnName": "执行人",
+ "GUID": "4bd4f915-e792-4219-ad86-6602ef9080bd"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=执行人"
+ }
+ }
+ ]
+ }
+ },
+ "ID": "c1694818e1114d4ab935a038edf6ed39",
+ "Comments": "从视图统计项目的信息"
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=个人工时情况.总计划工时-个人工时情况.总实际工时"
+ }
+ },
+ "value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=工时数"
+ },
+ "compareType": 4
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "提成系数",
+ "ParameterValue": "0",
+ "ID": "1334e3b4f0ec48228a6e7e26cf3529f2"
+ }
+ ],
+ "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
+ "ID": "74d5d00b-f4aa-4e25-8b34-1ae68ac34759"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "项目统计信息",
+ "TableValue": {
+ "TableName": "View_项目统计信息",
"TableValueType": 1,
"BindingInfos": [
{
"BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "总核定工时",
- "GUID": "30e9fee2-cc98-4ce8-954a-4694deb3225d"
+ "TableName": "View_项目统计信息",
+ "ColumnName": "项目预算费用",
+ "GUID": "1f23c586-e318-41f8-9e2c-f9fc47949199"
},
- "ColumnName": "总核定工时"
+ "ColumnName": "项目预算费用"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "View_项目统计信息",
+ "ColumnName": "总成本",
+ "GUID": "7c3a493f-d2ac-49b3-957f-7a772d5138bf"
+ },
+ "ColumnName": "总成本"
}
],
"SqlCondition": {
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
"ColumnBindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "任务ID",
- "GUID": "4ef81414-5f02-4242-a14a-3c0762e72e33"
+ "TableName": "View_项目统计信息",
+ "ColumnName": "项目ID",
+ "GUID": "0aa2d908-82fb-4233-a1e8-eb5a36cecaa2"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务ID"
+ "SerializeProperty": "=任务信息.项目ID"
}
- }
+ },
+ "TopCount": "1"
},
- "ID": "f7ed048b6276441b8981d5758a1bf56a"
+ "ID": "7b60254b867f4588b10193dec395b3b9",
+ "Comments": "从视图统计项目的信息"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -867,12 +854,12 @@
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
"ParamObject": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务统计信息.总核定工时+工时数"
+ "SerializeProperty": "=预测本次产生成本+项目统计信息.总成本"
}
},
"value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务信息.任务预算工时"
+ "SerializeProperty": "=项目统计信息.项目预算费用"
},
"compareType": 2
},
@@ -880,29 +867,50 @@
{
"$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
"ErrorCode": "400",
- "Message": "此次报工超过任务工时限制，请修改后提交！"
+ "Message": "该项目预算费用不足，为确保项目成本可控，请联系项目经理增加项目预算后再提交。"
}
],
- "Comments": "如果任务当前工时+本次报工工时大于预算，则拦截",
- "ID": "18e16fe3-8d87-4306-900f-cf0b7ab17100"
+ "ID": "bec008b6-f3e8-41a8-a550-78a0190147fc"
}
]
}
],
- "Comments": "如果上面两条项目都没超标，就检查是否设置了任务预算工时。",
- "ID": "7b3a035b-cbd4-4beb-ba34-3b0da0a8b25c"
+ "Comments": "如果个人工时够用，那就检测项目费用有没有超标",
+ "ID": "c6817e34-211f-4f03-b4ba-ecf2e3e3179a"
}
]
}
],
- "Comments": "如果提交的工时类型等于项目工时的核定方式",
- "ID": "3e24d042-00d3-46e1-b07f-9134849cc28c"
+ "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标",
+ "ID": "61aad8d4-ae29-4364-8804-9dc5b8089e99"
}
]
}
],
- "Comments": "严格模式下，需要校验工时和费用是否超标",
- "ID": "6884a15a-1da6-4a79-9d98-42f406e6b48b"
+ "Comments": "只有实际工时才计算薪资",
+ "ID": "0c6afe93-7518-48bd-ad4d-5f872d1ba856"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "提成系数",
+ "ParameterValue": "0",
+ "ID": "b63c693da0e3450e8cd3e248a56f7487"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "计算时薪",
+ "ParameterValue": "0",
+ "ID": "325abdb37c644aab8a3408594c00e22e"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "时薪计算来源",
+ "ID": "f3c8d6221df444e5aa74a1b772b6d5dd"
+ }
+ ],
+ "ID": "009e0869-724b-4563-a405-c13d3adf052f"
}
]
},
@@ -913,7 +921,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=工时数"
},
- "ID": "9fa5a1b21c574f1a8b59a42611442fd7"
+ "ID": "7a4247754602413e9b1915d6d32ba74e"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -922,7 +930,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1"
},
- "ID": "e9869319ddf04a8395ae0b9cb8c5d2c4"
+ "ID": "a619e59fb9a5483086717b41b149c937"
},
{
"$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
@@ -946,7 +954,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=开始日期+(index-1)"
},
- "ID": "579061b5cf414774a2af1aaa9c04b29b"
+ "ID": "113f3feeed2644ea9d71bb4251b369dc"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -1007,7 +1015,7 @@
},
"NullFormulaValueQueryPolicy": 0
},
- "ID": "5bbe6bbbe41642e19df09b58c7b289c3"
+ "ID": "d656db8f5ee848ebbe64cf32f9ef2d6f"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -1039,7 +1047,7 @@
"ID": "44b51db4c6be470dbc468d4a9abfa061"
}
],
- "ID": "3e265f58-f9c4-4380-a74c-a0a3ac089b8b"
+ "ID": "a84a8ffe-bab2-412a-83d5-2de8192e6c49"
},
{
"CommandList": [
@@ -1053,7 +1061,7 @@
"ID": "de7c26c08e4e4086bfa6f4d8dbcaa4fe"
}
],
- "ID": "69598862-13bb-447e-afaa-39457f3d44e3"
+ "ID": "11949f5b-bf48-49ad-8bb5-0e4a027f4ef5"
}
]
},
@@ -1080,10 +1088,10 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=IF(OR(任务成员.参与人负荷=\"\",任务成员.参与人负荷=0,任务成员.参与人负荷>24),24,任务成员.参与人负荷)"
},
- "ID": "03f94c6a676740b799eddd0aafce2fe5"
+ "ID": "4b21e5b0c6bc404f919bd5f571194972"
}
],
- "ID": "549f42fc-cbe4-422c-a493-02d7ce693210"
+ "ID": "217420ce-beff-4aab-af78-6ac36d51ad67"
},
{
"Condition": {
@@ -1102,10 +1110,10 @@
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "执行人负荷",
"ParameterValue": "24",
- "ID": "f998993f4e8f4778a448ca19dc771a2b"
+ "ID": "e71ec8ddac3d4747847c0515968762b8"
}
],
- "ID": "baab28eb-8a70-4c8c-97c9-769d468934be"
+ "ID": "2e148162-ac78-43e8-abe0-d608c1524652"
}
]
},
@@ -1116,7 +1124,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+计算本次分配工时"
},
- "ID": "36354abf29e44a4e9790b6db43c12fa9"
+ "ID": "77a3895a2edd474cbf2e59c9957ad6b4"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -1160,7 +1168,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "项目ID",
- "GUID": "344588f5-2837-40af-ac17-16ba8d1d493a"
+ "GUID": "1955b8c6-8a47-4adf-8496-d42bb51a380d"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1171,7 +1179,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "任务ID",
- "GUID": "b3e83a46-79ec-4561-ba4f-7943d9ee7e71"
+ "GUID": "d8b2f7bb-534f-42eb-8e51-dfc3e0b5d88a"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1182,7 +1190,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时日期",
- "GUID": "5b5d6e91-43a2-44bf-85b9-ba2d2954465a"
+ "GUID": "3440899e-0e25-451e-999e-414a6c98c0ce"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1193,7 +1201,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时类型",
- "GUID": "e0186f85-f462-44d1-84dc-b78871d946b0"
+ "GUID": "ccf8e046-5e84-4059-966d-30b4477b06b3"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1204,7 +1212,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行人",
- "GUID": "0eafacff-e048-48f3-b48f-0ca82a89d73d"
+ "GUID": "d0641f9c-25fd-43ed-aaf5-c5a0097c10e3"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1215,7 +1223,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行内容",
- "GUID": "6ca1d705-d57c-44f2-914b-eff4774fa49a"
+ "GUID": "a5819bc3-cc9f-434a-a937-99518e1caa86"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1226,7 +1234,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时",
- "GUID": "6dcb7e08-7e02-4c85-9264-453d97833ba6"
+ "GUID": "4ba21b15-6d92-4e71-8fa3-c5fd3bdb245c"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1237,7 +1245,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "时薪单价",
- "GUID": "f7409fd9-e56a-4767-bc33-06b0010d71cd"
+ "GUID": "f8726d71-67c3-4437-b1e9-6ff105b4f7ca"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1248,18 +1256,18 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "提成系数",
- "GUID": "78395ee2-2002-4354-9309-d5aeab731ad0"
+ "GUID": "89c3976d-acc0-4598-b837-8bacd9876886"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务信息.提成系数"
+ "SerializeProperty": "=提成系数"
}
},
{
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "时薪来源",
- "GUID": "99f983c0-c3bc-48c0-a98e-9754e62d5268"
+ "GUID": "f8483245-4ea2-423d-8518-68d80d83834b"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1309,7 +1317,7 @@
]
}
],
- "ID": "c13c63bd-75ed-4fd4-9e63-9c5b780a49e4"
+ "ID": "a90fe243-1504-4b5e-a6d6-be6cdd18d6dc"
},
{
"CommandList": [
@@ -1322,7 +1330,7 @@
}
}
],
- "ID": "421b11ec-1f58-4993-bfae-5fa734979761"
+ "ID": "bec106e1-c3db-4020-aaca-f56d027f769b"
}
]
}
@@ -1336,7 +1344,7 @@
"Message": "提交工时成功"
}
],
- "ID": "93db7169-bcca-429d-aacf-3fa2b546ee52"
+ "ID": "2353efbd-e5b5-40ee-8e0d-6959f2f38cb8"
},
{
"CommandList": [
@@ -1349,12 +1357,12 @@
}
}
],
- "ID": "bee19115-020f-4c50-8e0b-4a87f2e00ef3"
+ "ID": "8bd26440-0bbd-4e27-ad10-08b3d3668227"
}
]
}
],
- "ID": "6f0e4d07-319b-4f31-8384-aa5b2f618f5f"
+ "ID": "a207d3ae-ca93-42a5-b470-2bb73c554012"
},
{
"CommandList": [
@@ -1364,7 +1372,7 @@
"Message": "成员不在任务内，无法报工！"
}
],
- "ID": "60999756-b879-4cc0-93c2-1658179e46f2"
+ "ID": "a03e07aa-d2a3-4e47-9761-b26576651505"
}
]
}
diff --git a/ServerCommands/项目/新增或修改项目.json b/ServerCommands/项目/新增或修改项目.json
index bd683d6a..c6e0b3bb 100644
--- a/ServerCommands/项目/新增或修改项目.json
+++ b/ServerCommands/项目/新增或修改项目.json
@@ -63,12 +63,6 @@
"IgnoreBlank": false
}
},
- {
- "Name": "工时核定方式",
- "DataValidationInfo": {
- "IgnoreBlank": false
- }
- },
{
"Name": "权限",
"DataValidationInfo": {}
@@ -135,7 +129,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目名称",
- "GUID": "d789054a-705a-48a4-8eb6-909c8245d8a2"
+ "GUID": "ef0e4ec0-928a-49e5-91d9-61e589f88a04"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -146,7 +140,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目简介",
- "GUID": "304c8e44-8048-46e4-b2c1-8c11042d535d"
+ "GUID": "c9af7fbc-55b1-458c-b1bb-763e93249d15"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -157,7 +151,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目封面",
- "GUID": "a1b25d5f-6e92-4618-8bbc-91e616972a74"
+ "GUID": "fb266358-306f-4013-b841-8eb15eb1f48c"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -168,7 +162,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目经理",
- "GUID": "5ca1ef62-9af5-4455-9977-5f623bea1241"
+ "GUID": "4cb21c47-2cfe-428a-a8d5-166ae38442b8"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -179,7 +173,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目分组",
- "GUID": "3fbc301c-7a1c-4bde-b99b-1d8768a03ca6"
+ "GUID": "ee1ae52d-ae7b-476d-9f08-e66536ebe41a"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -190,7 +184,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "所属客户",
- "GUID": "b7bffd3a-ee4d-434b-a709-b48b3a8436c1"
+ "GUID": "62edfb2d-5190-4a43-8ef6-c37803a2d7b6"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -201,29 +195,18 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "所属客户部门",
- "GUID": "ee8ba706-1a9f-4822-a5ca-3805c1309893"
+ "GUID": "1e0c4ad6-5a27-4a01-af04-efd87cce4947"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=所属客户部门"
}
},
- {
- "BindingInfo": {
- "TableName": "项目表",
- "ColumnName": "工时核定方式",
- "GUID": "9f70eec9-8a7f-43c4-b9fb-809711b6fb91"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=工时核定方式"
- }
- },
{
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目预算工时",
- "GUID": "6a35b2f1-1d4f-4c62-9d4e-ee9ac4a263b5"
+ "GUID": "6a1d7802-541a-491a-9e87-b30f89df806b"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -234,7 +217,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目预算费用",
- "GUID": "c8d40ab7-529a-42d0-8e51-544ec00fa861"
+ "GUID": "a3a6f341-39ae-4e0d-b20e-fbc72d63bb14"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -245,7 +228,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "公开",
- "GUID": "86d2976c-aa02-4f34-b8b5-87fab4176c2f"
+ "GUID": "e9c8eb47-b755-45b8-821f-24c2e9267ee6"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -256,7 +239,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "严格模式",
- "GUID": "fdf59c78-310c-4dc8-bcf7-658e413f21ab"
+ "GUID": "abb3e010-e177-4084-b1cf-06cd47c68597"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -267,7 +250,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目方案",
- "GUID": "2ffc1113-d22f-431f-9575-aa26f842b24d"
+ "GUID": "dfd81bc0-7073-42a1-9140-764a433e0d39"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -278,7 +261,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "预算方案",
- "GUID": "68a709b4-8855-4cab-94c0-1a53526a445d"
+ "GUID": "60f76b0c-f634-4da3-9dd3-26ce4a2190ee"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -289,7 +272,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "计划开始日期",
- "GUID": "cacd203d-aaa6-44bd-b326-156a3403919d"
+ "GUID": "cc96c852-ceb0-4b0f-898b-a0c1bb039ce5"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -300,7 +283,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "计划完成日期",
- "GUID": "590db402-19fb-4c45-8b80-30e15e32cb57"
+ "GUID": "3b2794a7-71a5-436a-963d-5705384fbf0c"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -311,7 +294,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "网络资源",
- "GUID": "41c9ff18-6fd7-4c5c-980e-e8d789132770"
+ "GUID": "8980bc8f-b53e-4f6f-bc9b-a25d0a287a16"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -322,7 +305,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目状态",
- "GUID": "b2a367b5-d63b-4dd7-8074-c1ae6ba65314"
+ "GUID": "d5f7864f-45a7-4dc0-81b2-ea97f601a910"
},
"Value": "0"
},
@@ -330,7 +313,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "删除",
- "GUID": "8b5ece8c-48c3-42e9-b041-0274e710d9db"
+ "GUID": "ef734baf-623a-46bf-9bcd-6fd324f9f96f"
},
"Value": "0"
}
@@ -404,7 +387,7 @@
"Message": "项目创建成功，请等待审批"
}
],
- "ID": "144671ba-cc32-438f-af46-e141f0c353c9"
+ "ID": "5da18cfa-fe9f-4b69-8560-34c4e38c9ffa"
},
{
"CommandList": [
@@ -414,12 +397,12 @@
"Message": "项目已创建，但未能发起审批，请手动发起审批流程！"
}
],
- "ID": "4219b6b1-bf48-403d-a253-906f2fff5cec"
+ "ID": "abbcae99-7de8-4c14-badf-451f9addc149"
}
]
}
],
- "ID": "78fb41d1-913a-47dc-a7ac-08b6379b6870"
+ "ID": "f16c4805-04cc-4ee7-b3e7-ba0bb654be09"
},
{
"CommandList": [
@@ -437,14 +420,6 @@
"GUID": "b8486155-4f64-4dd8-b85c-16543680907f"
},
"ColumnName": "严格模式"
- },
- {
- "BindingInfo": {
- "TableName": "项目表",
- "ColumnName": "工时核定方式",
- "GUID": "394415d4-b1ba-4c8e-851a-0e427e1ec361"
- },
- "ColumnName": "工时核定方式"
}
],
"SqlCondition": {
@@ -462,41 +437,22 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
- "ID": "7d341adfdcbd425a8fea4594af49b2e9"
+ "ID": "284902c03cb74c7993b7d8dbf2fce968"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
"ConditionAndCommandPairList": [
{
"Condition": {
- "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
- "SubConditions": [
- {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=预算金额"
- }
- },
- "value": "1"
- },
- {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=工时核定方式"
- }
- },
- "value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目信息.工时核定方式"
- }
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=预算金额"
}
- ]
+ },
+ "value": "1"
},
"CommandList": [
{
@@ -517,18 +473,18 @@
{
"BindingInfo": {
"TableName": "View_项目统计信息",
- "ColumnName": "项目预算费用",
- "GUID": "b5e66ce2-c04f-45e2-9ef8-cb6f1be2534d"
+ "ColumnName": "总实际工时",
+ "GUID": "5a3c8588-de2e-4e88-8116-09021dc36bd8"
},
- "ColumnName": "项目预算费用"
+ "ColumnName": "总实际工时"
},
{
"BindingInfo": {
"TableName": "View_项目统计信息",
- "ColumnName": "总核定工时",
- "GUID": "712fd696-cb7a-4afe-ab22-c22061fd0c83"
+ "ColumnName": "项目预算费用",
+ "GUID": "b5e66ce2-c04f-45e2-9ef8-cb6f1be2534d"
},
- "ColumnName": "总核定工时"
+ "ColumnName": "项目预算费用"
},
{
"BindingInfo": {
@@ -553,42 +509,26 @@
},
"TopCount": "1"
},
- "ID": "c9d76c19accd4bdb9637342bd8efe42f"
+ "ID": "a14bc416e4cb49b0916ce2ea17bd826b"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
"ConditionAndCommandPairList": [
{
"Condition": {
- "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
- "SubConditions": [
- {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=工时核定方式"
- }
- },
- "value": "计划"
- },
- {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目统计信息.总核定工时"
- }
- },
- "value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目统计信息.项目预算工时"
- },
- "compareType": 2
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目统计信息.总实际工时"
}
- ]
+ },
+ "value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目统计信息.项目预算工时"
+ },
+ "compareType": 2
},
"CommandList": [
{
@@ -596,43 +536,27 @@
"ErrorCode": "400",
"Message": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=\"无法为您切换为严格模式，因为你要求按\"&工时核定方式&\"工时来核定成本，但项目工时此时已经超标！\""
+ "SerializeProperty": "=\"项目实际工时已超标，无法为您切换为严格模式！\""
}
}
],
- "ID": "0d133ce7-06f7-4678-8a0b-e708636d7f62"
+ "ID": "a0b87cac-38f9-481a-b077-675313d0cb9d"
},
{
"Condition": {
- "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
- "SubConditions": [
- {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=工时核定方式"
- }
- },
- "value": "实际"
- },
- {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目统计信息.总核定成本"
- }
- },
- "value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目统计信息.项目预算费用"
- },
- "compareType": 2
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目统计信息.总核定成本"
}
- ]
+ },
+ "value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目统计信息.项目预算费用"
+ },
+ "compareType": 2
},
"CommandList": [
{
@@ -640,17 +564,17 @@
"ErrorCode": "400",
"Message": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=\"无法为您切换为严格模式，因为你要求按\"&工时核定方式&\"工时来核定成本，但项目费用此时已经超标！\""
+ "SerializeProperty": "=\"项目费用已超标，此时无法为您切换为严格模式\""
}
}
],
- "ID": "6915f6a5-544a-4494-a3a1-275f1e67256d"
+ "ID": "825c977c-5a23-4561-8c5f-9467fe75f0ff"
}
]
}
],
"Comments": "如果是更新项目，且改变了工时核定方式、严格模式，那么就要校验。超标就不允许切换",
- "ID": "6c18ae88-cdb1-4b49-9d5c-a52fa713b0e8"
+ "ID": "321ec68e-d70e-496f-9acc-38e7498e3f53"
}
]
},
@@ -676,7 +600,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目名称",
- "GUID": "d86f9206-3342-4ed2-b561-4b3cddb33579"
+ "GUID": "b06dba3d-143f-407d-a74b-0ef61b3a0d92"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -687,7 +611,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目简介",
- "GUID": "c8c387b4-a86d-4e0c-bd4e-c0ffb03b8b7e"
+ "GUID": "74c9a369-2553-48d1-8e5d-033e66efa060"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -698,7 +622,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目封面",
- "GUID": "2ab448ad-6d8a-4215-af51-b3978fd23077"
+ "GUID": "7cd155ae-96fb-4029-a790-d59e22da86ad"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -709,7 +633,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目经理",
- "GUID": "f6ed5ea6-d803-4991-bf54-08b29889a6c0"
+ "GUID": "028ebc72-432b-40e9-b633-4cb96797a966"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -720,7 +644,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目分组",
- "GUID": "5c70da10-1fe1-473f-9abb-9ea5c2b70498"
+ "GUID": "fb812d0b-1ac5-4751-929b-d1fc999c1a10"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -731,7 +655,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "所属客户",
- "GUID": "03e20733-6451-4018-b51a-0107ce0a98b2"
+ "GUID": "7464e2eb-0483-4273-97f0-941fb76313b1"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -742,29 +666,18 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "所属客户部门",
- "GUID": "17c99024-ddeb-404e-aa45-a60acfc53fab"
+ "GUID": "48ffd769-0d1d-430c-a36d-322292b6310a"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=所属客户部门"
}
},
- {
- "BindingInfo": {
- "TableName": "项目表",
- "ColumnName": "工时核定方式",
- "GUID": "020b5096-5705-4b0b-9a6e-e7a59da2e25b"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=工时核定方式"
- }
- },
{
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "公开",
- "GUID": "695bed47-145c-4876-802d-3e97df9e4a21"
+ "GUID": "d21de492-11d7-4212-911d-2d2d9d7012b6"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -775,7 +688,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "严格模式",
- "GUID": "b6897f1f-e70c-4f8e-b733-5b927a3cb191"
+ "GUID": "92f5ea47-300f-497a-b262-d39274a80b9e"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -786,7 +699,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "计划开始日期",
- "GUID": "7baffe04-7c4a-4ce9-ab22-49c4e0a46211"
+ "GUID": "99c71307-f344-43db-8c96-901f1e206cde"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -797,7 +710,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "计划完成日期",
- "GUID": "d60ca66a-d1e8-4310-83e4-f0ea077cc89d"
+ "GUID": "f0219dd8-d4b6-4f44-ba9d-49229fa8fe04"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -808,7 +721,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目方案",
- "GUID": "f44d7a80-bfb3-4f8f-8fb7-8c266a283cab"
+ "GUID": "632f7f59-8a54-4717-a90c-a9afb93b293b"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -819,7 +732,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "预算方案",
- "GUID": "438bd730-d6b2-46fc-814c-f7cb51eedbaf"
+ "GUID": "600e9c82-d6f3-46f9-8500-a72d432ffa5a"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -830,7 +743,7 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "网络资源",
- "GUID": "dea2f069-b6fa-4052-adff-5158cd68670a"
+ "GUID": "261e6801-fcfa-44a8-bb2c-0d446ac89cc0"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -840,7 +753,7 @@
]
}
],
- "ID": "34654d41-a858-49cc-83f2-282414978f42"
+ "ID": "d44b64d0-862b-47df-a944-dd600e22bc5a"
}
]
}
diff --git a/Tables/任务/子任务视图.json b/Tables/任务/子任务视图.json
index 5142a946..635b1da6 100644
--- a/Tables/任务/子任务视图.json
+++ b/Tables/任务/子任务视图.json
@@ -31,13 +31,6 @@
"Name": "执行者",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
- {
- "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
- "DatabaseColumnType": "nvarchar",
- "MaxLength": -1,
- "Name": "参与者",
- "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
- },
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
"DatabaseColumnType": "datetime",
@@ -64,7 +57,7 @@
"DatabaseColumnType": "bigint",
"MaxLength": -1,
"Name": "版本",
- "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
@@ -78,7 +71,7 @@
"DatabaseColumnType": "nvarchar",
"MaxLength": -1,
"Name": "备注",
- "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
@@ -99,21 +92,14 @@
"DatabaseColumnType": "bigint",
"MaxLength": -1,
"Name": "分组ID",
- "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
- },
- {
- "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
- "DatabaseColumnType": "bigint",
- "MaxLength": -1,
- "Name": "工时核定方式",
- "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
"DatabaseColumnType": "nvarchar",
"MaxLength": -1,
"Name": "关联资源",
- "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
@@ -134,7 +120,7 @@
"DatabaseColumnType": "nvarchar",
"MaxLength": -1,
"Name": "FGC_LastModifier",
- "ColumnType": "System.Byte[], System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
@@ -142,6 +128,83 @@
"MaxLength": -1,
"Name": "FGC_LastModifyDate",
"ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "float",
+ "MaxLength": -1,
+ "Name": "任务预算工时",
+ "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "层级",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "前置任务",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "工期",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "次序",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "bit",
+ "MaxLength": -1,
+ "Name": "里程碑",
+ "ColumnType": "System.Boolean, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "float",
+ "MaxLength": -1,
+ "Name": "进度",
+ "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "参与人",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "功能名称",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "收集反馈",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "功能描述",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
}
],
"ExternalDatabaseInfo": {
@@ -149,7 +212,7 @@
"ConnectionId": "业务表",
"SourceTableName": "子任务视图",
"SourceTableSchema": "dbo",
- "CreateViewSql": "SELECT * FROM \"任务表\"\r\nWHERE \"父任务ID\" is not NULL",
+ "CreateViewSql": "SELECT * FROM \"任务表\" WHERE \"父任务ID\" IS NOT NULL",
"ViewInfo": {
"ViewName": "子任务视图",
"IsUpdatable": true,
diff --git a/Tables/字典表/工时分配方式.json b/Tables/字典表/工时分配方式.json
new file mode 100644
index 00000000..21ebcc1b
--- /dev/null
+++ b/Tables/字典表/工时分配方式.json
@@ -0,0 +1,60 @@
+{
+ "Name": "工时分配方式",
+ "Columns": [
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "Required": true,
+ "Unique": true,
+ "AutoIncrement": true,
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "ID",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "分配方式",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "文本",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_Creator"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_CreateDate"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_LastModifier"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_LastModifyDate"
+ }
+ ],
+ "ExternalDatabaseInfo": {
+ "DataBaseType": "6db454c0-531c-4395-9122-921a18942902",
+ "AllowModifySchema": true,
+ "ConnectionId": "业务表",
+ "SourceTableName": "工时分配方式",
+ "SourceTableSchema": "dbo"
+ },
+ "PrimaryKey": [
+ "ID"
+ ],
+ "Indexes": []
+}
\ No newline at end of file
diff --git a/Tables/工时/View_任务工时统计.json b/Tables/工时/View_任务工时统计.json
index 8baa361b..dfbfd55f 100644
--- a/Tables/工时/View_任务工时统计.json
+++ b/Tables/工时/View_任务工时统计.json
@@ -113,18 +113,6 @@
"DataColumnName": "实际工时",
"Name": "总实际工时",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
- },
- {
- "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
- "BindingInfo": {
- "TableName": "View_任务工时统计",
- "ColumnName": "核定工时",
- "GUID": "6a8d98f3-25ad-4c5b-9a82-e032d9ae9638"
- },
- "AggregateFunction": 4,
- "DataColumnName": "核定工时",
- "Name": "总核定工时",
- "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
}
],
"ExternalDatabaseInfo": {
diff --git a/Tables/工时/人员工时统计视图.json b/Tables/工时/人员工时统计视图.json
index 57eb5e19..d19f453b 100644
--- a/Tables/工时/人员工时统计视图.json
+++ b/Tables/工时/人员工时统计视图.json
@@ -29,13 +29,6 @@
"Name": "实际工时",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
- {
- "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
- "DatabaseColumnType": "float",
- "MaxLength": -1,
- "Name": "核定工时",
- "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
- },
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
"DatabaseColumnType": "float",
@@ -59,12 +52,12 @@
"$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
"BindingInfo": {
"TableName": "人员工时统计视图",
- "ColumnName": "核定工时",
- "GUID": "e90a9de0-7e17-4e65-9ffc-648151609709"
+ "ColumnName": "实际工时",
+ "GUID": "a8bbb6b5-ef8a-407f-af3f-546f749918a1"
},
"AggregateFunction": 4,
- "DataColumnName": "核定工时",
- "Name": "总工时",
+ "DataColumnName": "实际工时",
+ "Name": "总实际工时",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
}
],
@@ -73,7 +66,7 @@
"ConnectionId": "业务表",
"SourceTableName": "人员工时统计视图",
"SourceTableSchema": "dbo",
- "CreateViewSql": "SELECT\r\n[执行人],\r\nCAST([日期] as date) 日期,\r\n[计划工时],\r\n[实际工时],\r\n[核定工时],\r\n[计算提成]\r\nFROM [View_任务工时统计] t",
+ "CreateViewSql": "SELECT\r\n[执行人],\r\nCAST([日期] as date) 日期,\r\n[计划工时],\r\n[实际工时],\r\n[计算提成]\r\nFROM [View_任务工时统计] t",
"ViewInfo": {
"ViewName": "人员工时统计视图",
"IsUpdatable": true,
diff --git a/Tables/项目/View_项目统计信息.json b/Tables/项目/View_项目统计信息.json
index fa59d943..2181adc2 100644
--- a/Tables/项目/View_项目统计信息.json
+++ b/Tables/项目/View_项目统计信息.json
@@ -30,13 +30,6 @@
"Name": "项目预算费用",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
- {
- "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
- "DatabaseColumnType": "varchar",
- "MaxLength": -1,
- "Name": "工时核定方式",
- "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
- },
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
"Required": true,
@@ -53,14 +46,6 @@
"Name": "总实际工时",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
- {
- "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
- "Required": true,
- "DatabaseColumnType": "float",
- "MaxLength": -1,
- "Name": "总核定工时",
- "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
- },
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
"Required": true,
@@ -101,6 +86,13 @@
"Name": "未完成任务数",
"ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "float",
+ "MaxLength": -1,
+ "Name": "已分配任务工时",
+ "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
"Formula": "[已完成任务数]&\"/\"&[总任务数量]",
@@ -127,7 +119,7 @@
},
{
"$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
- "Formula": "[总核定工时]&\"/\"&[项目预算工时]",
+ "Formula": "[总实际工时]&\"/\"&[项目预算工时]",
"Name": "工时成本情况",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
@@ -139,7 +131,7 @@
},
{
"$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
- "Formula": "IF([总核定工时]=0,0,INT([总核定工时]/[项目预算工时]*100))",
+ "Formula": "IF([总实际工时]=0,0,INT([总实际工时]/[项目预算工时]*100))",
"Name": "工时消耗比例",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
@@ -154,6 +146,12 @@
"Formula": "IF([总实际工时]=0,0,INT([总实际工时]/[总计划工时]*100))",
"Name": "计划工时使用比例",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
+ "Formula": "[已分配任务工时]&\"/\"&[项目预算工时]",
+ "Name": "工时分配情况",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
}
],
"ExternalDatabaseInfo": {
@@ -161,7 +159,7 @@
"ConnectionId": "业务表",
"SourceTableName": "View_项目统计信息",
"SourceTableSchema": "dbo",
- "CreateViewSql": "SELECT\r\n p.[ID] AS [项目ID],\r\n p.[项目名称] AS [项目标题],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n\t\tp.[工时核定方式],\r\n ISNULL(计划工时.总计划工时, 0) AS [总计划工时],\r\n ISNULL(实际工时.总实际工时, 0) AS [总实际工时],\r\n\t\t(CASE p.[工时核定方式]\r\n\tWHEN '计划' THEN ISNULL(计划工时.总计划工时, 0)\r\n\tELSE ISNULL(实际工时.总实际工时, 0)\r\nEND) as 总核定工时,\r\n ISNULL(总成本.总成本, 0) AS [总成本],\r\n ISNULL(项目成员.成员数量, 0) AS [项目成员数],\r\n ISNULL(任务统计.总任务数量, 0) AS [总任务数量],\r\n ISNULL(已完成任务.已完成任务数, 0) AS [已完成任务数],\r\n ISNULL(未完成任务.未完成任务数, 0) AS [未完成任务数]\r\nFROM\r\n [dbo].[项目表] p\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n SUM(工时) AS 总计划工时\r\n FROM\r\n [dbo].[任务工时表]\r\n WHERE\r\n 工时类型 = '计划'\r\n GROUP BY\r\n 项目ID\r\n) 计划工时 ON p.ID = 计划工时.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n SUM(工时) AS 总实际工时\r\n FROM\r\n [dbo].[任务工时表]\r\n WHERE\r\n 工时类型 = '实际'\r\n GROUP BY\r\n 项目ID\r\n) 实际工时 ON p.ID = 实际工时.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n SUM(工时 * 时薪单价 * 提成系数) AS 总成本\r\n FROM\r\n [dbo].[任务工时表]\r\n WHERE\r\n 工时类型 IN (SELECT 工时核定方式 FROM [dbo].[项目表] WHERE ID = 项目ID)\r\n GROUP BY\r\n 项目ID\r\n) 总成本 ON p.ID = 总成本.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n COUNT(DISTINCT 执行人) AS 成员数量\r\n FROM\r\n [dbo].[任务工时表]\r\n GROUP BY\r\n 项目ID\r\n) 项目成员 ON p.ID = 项目成员.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n COUNT(ID) AS 总任务数量\r\n FROM\r\n [dbo].[任务表]\r\n GROUP BY\r\n 项目ID\r\n) 任务统计 ON p.ID = 任务统计.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n COUNT(ID) AS 已完成任务数\r\n FROM\r\n [dbo].[任务表]\r\n WHERE\r\n 任务状态 = 2\r\n GROUP BY\r\n 项目ID\r\n) 已完成任务 ON p.ID = 已完成任务.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n COUNT(ID) AS 未完成任务数\r\n FROM\r\n [dbo].[任务表]\r\n WHERE\r\n 任务状态 < 2\r\n GROUP BY\r\n 项目ID\r\n) 未完成任务 ON p.ID = 未完成任务.项目ID;",
+ "CreateViewSql": "SELECT\r\n p.[ID] AS [项目ID],\r\n p.[项目名称] AS [项目标题],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n ISNULL(计划工时.总计划工时, 0) AS [总计划工时],\r\n ISNULL(实际工时.总实际工时, 0) AS [总实际工时],\r\n ISNULL(总成本.总成本, 0) AS [总成本],\r\n ISNULL(项目成员.成员数量, 0) AS [项目成员数],\r\n ISNULL(任务统计.总任务数量, 0) AS [总任务数量],\r\n ISNULL(已完成任务.已完成任务数, 0) AS [已完成任务数],\r\n ISNULL(未完成任务.未完成任务数, 0) AS [未完成任务数],\r\n\t\tSUM(ISNULL(task.任务预算工时, 0)) as 已分配任务工时\r\nFROM\r\n [dbo].[项目表] p\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n SUM(工时) AS 总计划工时\r\n FROM\r\n [dbo].[任务工时表]\r\n WHERE\r\n 工时类型 = '计划'\r\n GROUP BY\r\n 项目ID\r\n) 计划工时 ON p.ID = 计划工时.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n SUM(工时) AS 总实际工时\r\n FROM\r\n [dbo].[任务工时表]\r\n WHERE\r\n 工时类型 = '实际'\r\n GROUP BY\r\n 项目ID\r\n) 实际工时 ON p.ID = 实际工时.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n SUM(工时 * 时薪单价 * 提成系数) AS 总成本\r\n FROM\r\n [dbo].[任务工时表]\r\n GROUP BY\r\n 项目ID\r\n) 总成本 ON p.ID = 总成本.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n COUNT(DISTINCT 执行人) AS 成员数量\r\n FROM\r\n [dbo].[任务工时表]\r\n GROUP BY\r\n 项目ID\r\n) 项目成员 ON p.ID = 项目成员.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n COUNT(ID) AS 总任务数量\r\n FROM\r\n [dbo].[任务表]\r\n GROUP BY\r\n 项目ID\r\n) 任务统计 ON p.ID = 任务统计.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n COUNT(ID) AS 已完成任务数\r\n FROM\r\n [dbo].[任务表]\r\n WHERE\r\n 任务状态 = 2\r\n GROUP BY\r\n 项目ID\r\n) 已完成任务 ON p.ID = 已完成任务.项目ID\r\nLEFT JOIN (\r\n SELECT\r\n 项目ID,\r\n COUNT(ID) AS 未完成任务数\r\n FROM\r\n [dbo].[任务表]\r\n WHERE\r\n 任务状态 < 2\r\n GROUP BY\r\n 项目ID\r\n) 未完成任务 ON p.ID = 未完成任务.项目ID\r\nLEFT JOIN [任务表] task ON p.ID = task.[项目ID]\r\nGROUP BY \r\np.[ID],\r\np.[项目名称],\r\np.[项目预算工时],\r\np.[项目预算费用],\r\n计划工时.总计划工时,\r\n实际工时.总实际工时,\r\n总成本.总成本,\r\n项目成员.成员数量,\r\n任务统计.总任务数量,\r\n已完成任务.已完成任务数,\r\n未完成任务.未完成任务数;",
"ViewInfo": {
"ViewName": "View_项目统计信息",
"IsUpdatable": true,
diff --git a/Tables/项目/项目表.json b/Tables/项目/项目表.json
index aa27dda7..9132e806 100644
--- a/Tables/项目/项目表.json
+++ b/Tables/项目/项目表.json
@@ -56,6 +56,21 @@
"subTableName": "任务工时表",
"subColumnName": "项目ID",
"relatedColumnName": "ID"
+ },
+ {
+ "subTableName": "需求反馈登记表",
+ "subColumnName": "项目ID",
+ "relatedColumnName": "ID"
+ },
+ {
+ "subTableName": "反馈收集任务匿名视图",
+ "subColumnName": "项目ID",
+ "relatedColumnName": "ID"
+ },
+ {
+ "subTableName": "汇报子表",
+ "subColumnName": "关联项目",
+ "relatedColumnName": "ID"
}
]
},
@@ -152,7 +167,9 @@
},
"dataPermissionType": 2,
"roleNames": [
- "商务总监"
+ "商务总监",
+ "财务",
+ "项目总监"
]
},
{
@@ -180,13 +197,15 @@
"参与人": 5,
"参与人统计": 5,
"工时核定方式": 5,
+ "开启反馈收集": 5,
+ "开始及完成时间": 5,
"所属客户": 5,
"所属客户部门": 5,
"立项流程示例ID": 5,
"网络资源": 5,
"计划完成日期": 5,
- "开始及完成时间": 5,
"计划开始日期": 5,
+ "计算计划工期": 5,
"项目分组": 5,
"项目名称": 5,
"项目封面": 5,
@@ -198,22 +217,23 @@
"项目预算工时": 5,
"项目预算费用": 5,
"预算方案": 5,
- "计算计划工期": 5,
- "开启反馈收集": 5
+ "已分配计划工时": 5,
+ "工时分配方式": 5
},
"subTableOperations": {
"View_任务工时统计": 5,
"任务工时表": 5,
"任务成员表": 5,
"任务表": 5,
+ "反馈收集任务匿名视图": 5,
+ "汇报子表": 5,
+ "需求反馈登记表": 5,
"项目任务分组": 5,
"项目动态": 5,
"项目岗位": 5,
"项目成员表": 5,
"项目版本": 5,
- "项目预算变动表": 5,
- "需求反馈登记表": 5,
- "反馈收集任务匿名视图": 5
+ "项目预算变动表": 5
},
"dataFilter": {
"$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
@@ -236,13 +256,15 @@
"参与人": 5,
"参与人统计": 5,
"工时核定方式": 5,
+ "开启反馈收集": 5,
+ "开始及完成时间": 5,
"所属客户": 5,
"所属客户部门": 5,
"立项流程示例ID": 5,
"网络资源": 5,
"计划完成日期": 5,
- "开始及完成时间": 5,
"计划开始日期": 5,
+ "计算计划工期": 5,
"项目分组": 5,
"项目名称": 5,
"项目封面": 5,
@@ -254,22 +276,23 @@
"项目预算工时": 5,
"项目预算费用": 5,
"预算方案": 5,
- "计算计划工期": 5,
- "开启反馈收集": 5
+ "已分配计划工时": 5,
+ "工时分配方式": 5
},
"subTableOperations": {
"View_任务工时统计": 5,
"任务工时表": 5,
"任务成员表": 5,
"任务表": 5,
+ "反馈收集任务匿名视图": 5,
+ "汇报子表": 5,
+ "需求反馈登记表": 5,
"项目任务分组": 5,
"项目动态": 5,
"项目岗位": 5,
"项目成员表": 5,
"项目版本": 5,
- "项目预算变动表": 5,
- "需求反馈登记表": 5,
- "反馈收集任务匿名视图": 5
+ "项目预算变动表": 5
},
"dataFilter": {
"$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
@@ -292,13 +315,15 @@
"参与人": 5,
"参与人统计": 5,
"工时核定方式": 5,
+ "开启反馈收集": 5,
+ "开始及完成时间": 5,
"所属客户": 5,
"所属客户部门": 5,
"立项流程示例ID": 5,
"网络资源": 5,
"计划完成日期": 5,
- "开始及完成时间": 5,
"计划开始日期": 5,
+ "计算计划工期": 5,
"项目分组": 5,
"项目名称": 5,
"项目封面": 5,
@@ -310,22 +335,23 @@
"项目预算工时": 5,
"项目预算费用": 5,
"预算方案": 5,
- "计算计划工期": 5,
- "开启反馈收集": 5
+ "已分配计划工时": 5,
+ "工时分配方式": 5
},
"subTableOperations": {
"View_任务工时统计": 5,
"任务工时表": 5,
"任务成员表": 5,
"任务表": 5,
+ "反馈收集任务匿名视图": 5,
+ "汇报子表": 5,
+ "需求反馈登记表": 5,
"项目任务分组": 5,
"项目动态": 5,
"项目岗位": 5,
"项目成员表": 5,
"项目版本": 5,
- "项目预算变动表": 5,
- "需求反馈登记表": 5,
- "反馈收集任务匿名视图": 5
+ "项目预算变动表": 5
},
"dataFilter": {
"$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core"
@@ -407,6 +433,13 @@
"Name": "工时核定方式",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "int",
+ "MaxLength": -1,
+ "Name": "工时分配方式",
+ "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
"DatabaseColumnType": "float",
@@ -548,6 +581,19 @@
"Name": "计算计划工期",
"ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务预算工时",
+ "GUID": "8ae04d9f-fc83-490e-a736-f8a40cf8183b"
+ },
+ "AggregateFunction": 4,
+ "DataColumnName": "任务预算工时",
+ "DetailTableName": "任务表",
+ "Name": "已分配计划工时",
+ "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
@@ -614,6 +660,20 @@
"ForeignTable": "项目表",
"ForeignColumn": "项目分组",
"IsDetailTableRelation": true
+ },
+ {
+ "PrimaryTable": "View_项目统计信息",
+ "PrimaryColumn": "项目ID",
+ "ForeignTable": "项目表",
+ "ForeignColumn": "ID",
+ "IsDetailTableRelation": false
+ },
+ {
+ "PrimaryTable": "工时分配方式",
+ "PrimaryColumn": "ID",
+ "ForeignTable": "项目表",
+ "ForeignColumn": "工时分配方式",
+ "IsDetailTableRelation": true
}
],
"Indexes": []
diff --git a/Tables/项目/项目预算变动表.json b/Tables/项目/项目预算变动表.json
index 6926f135..e8858768 100644
--- a/Tables/项目/项目预算变动表.json
+++ b/Tables/项目/项目预算变动表.json
@@ -27,6 +27,7 @@
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DefaultValue": 0,
"DatabaseColumnType": "bigint",
"MaxLength": -1,
"Name": "原预算工时",
@@ -34,6 +35,7 @@
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DefaultValue": 0.0,
"DatabaseColumnType": "float",
"MaxLength": -1,
"Name": "原预算费用",
@@ -41,6 +43,7 @@
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DefaultValue": 0,
"DatabaseColumnType": "bigint",
"MaxLength": -1,
"Name": "增加工时",
@@ -48,6 +51,7 @@
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DefaultValue": 0.0,
"DatabaseColumnType": "float",
"MaxLength": -1,
"Name": "增加费用",