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

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
+}//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

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": [

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
+}//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