{"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

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

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

Pages/项目/项目首页/项目首页-容器页面/项目成员.rd

@@ -3,10 +3,6 @@
   "ColumnCount": 41,
   "RowCount": 7,
   "CustomNames": [
-    {
-      "Name": "工时核定方式",
-      "Formula": "项目成员!$B$7"
-    },
     {
       "Name": "当前岗位ID",
       "Formula": "项目成员!$F$7"