{"Message":"1. 完善任务新增、变更时的预算工时核验，对子任务类型做出判断；\r\n2. 修改汇报时的填报字段，去掉项目ID，由后端生成；","MessageType":2,"Modules":[{"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":3,"Type":23,"Name":"TableView/项目任务树视图"}],"Version":"v1"}

Pages/汇报/导入汇报数据.json

@@ -191,6 +191,11 @@
           "DesignLengthInPixel": 32.0
         }
       },
+      "28": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
       "29": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
@@ -200,39 +205,18 @@
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
         }
-      },
-      "31": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "32": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "33": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "34": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
       }
     },
-    "Count": 35,
+    "Count": 31,
     "DefaultSize": 32.0
   },
   "Values": {
     "1,1": "筛选日期",
-    "1,31": "批量导入",
+    "1,27": "批量导入",
     "3,5": "汇报日期",
     "3,11": "汇报内容",
     "3,21": "工时",
-    "3,25": "关联项目",
-    "3,29": "关联任务"
+    "3,25": "关联任务"
   },
   "AttachInfos": {
     "1,3": {
@@ -287,7 +271,7 @@
         "DefautWeekFormat": "yyyy 第 WW 周"
       }
     },
-    "1,31": {
+    "1,27": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -337,10 +321,6 @@
                         "SourceCell": "工时",
                         "TargetCell": "工时"
                       },
-                      {
-                        "SourceCell": "关联项目",
-                        "TargetCell": "关联项目"
-                      },
                       {
                         "SourceCell": "关联任务",
                         "TargetCell": "关联任务"
@@ -359,7 +339,7 @@
                     "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon"
                   }
                 ],
-                "ID": "7111282a-4981-4ccb-91e6-86c77ca0d67c"
+                "ID": "8b162166-9e2f-49d9-acad-ebcc4f190d8a"
               },
               {
                 "CommandList": [
@@ -369,7 +349,7 @@
                     "Message": "请至少选择一行进行导入"
                   }
                 ],
-                "ID": "bf270bba-a245-439a-8932-70ff1ac61bd8"
+                "ID": "68b43c89-01aa-4c4b-98d7-cef306d256c9"
               }
             ]
           }
@@ -392,7 +372,7 @@
         "RowIndex": 3,
         "ColumnIndex": 1,
         "RowCount": 3,
-        "ColumnCount": 33,
+        "ColumnCount": 29,
         "SqlCondition": {
           "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
           "SubConditions": [
@@ -488,36 +468,11 @@
       }
     },
     "4,25": {
-      "NameUsedInJavaScript": "关联项目",
-      "BindingInfo": {
-        "TableName": "成员计划内容合并视图",
-        "ColumnName": "项目ID",
-        "GUID": "d0955b40-c1b2-4696-93cd-a4aece3f44cc"
-      },
-      "CellType": {
-        "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon",
-        "DropdownButtonModeInListview": 1,
-        "IsBounding": true,
-        "DataSource": "项目表",
-        "ValueColumnBindingInfo": {
-          "TableName": "项目表",
-          "ColumnName": "ID",
-          "GUID": "573668ee-bc6b-44e9-97f0-dae3d73a66e2"
-        },
-        "DisplayColumnBindingInfo": {
-          "TableName": "项目表",
-          "ColumnName": "项目名称",
-          "GUID": "8bc5331c-d1ca-424b-bc46-2ecbfb6ed887"
-        },
-        "ReadOnly": true
-      }
-    },
-    "4,29": {
       "NameUsedInJavaScript": "关联任务",
       "BindingInfo": {
         "TableName": "成员计划内容合并视图",
         "ColumnName": "任务ID",
-        "GUID": "af4c8ec1-3a42-4381-b33e-b23d8b049213"
+        "GUID": "12f36d5e-4025-47ec-ba9d-3b57e18235d3"
       },
       "CellType": {
         "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon",
@@ -649,7 +604,6 @@
       "3,23": 0,
       "3,24": 0,
       "3,25": 2,
-      "3,29": 2,
       "4,2": 1,
       "4,5": 3,
       "4,11": 4,
@@ -658,7 +612,6 @@
       "4,23": 0,
       "4,24": 0,
       "4,25": 2,
-      "4,29": 2,
       "9,1": 6,
       "9,2": 6,
       "9,3": 6,
@@ -672,25 +625,23 @@
     }
   },
   "Spans": [
-    "7,1,1,33",
-    "1,31,1,3",
+    "7,1,1,29",
+    "1,27,1,3",
     "1,1,1,2",
-    "5,1,1,33",
+    "5,1,1,29",
     "9,1,1,3",
     "9,4,1,3",
     "1,3,1,16",
     "4,2,1,3",
     "4,5,1,6",
-    "4,25,1,4",
-    "4,29,1,5",
+    "4,25,1,5",
     "4,21,1,4",
+    "4,11,1,10",
     "3,2,1,3",
     "3,5,1,6",
+    "3,11,1,10",
     "3,21,1,4",
-    "3,25,1,4",
-    "3,29,1,5",
-    "4,11,1,10",
-    "3,11,1,10"
+    "3,25,1,5"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -722,4 +673,4 @@
       "Formula": "导入汇报数据!$D$2"
     }
   ]
-}//nId1m1TUK/fwuPAwh5+9kRE7vcRPumc4zCNKypHYDPLR80vn2yiA9aqDXU7WcciYOK0hFefWG4P2/a76DqlMvA3W0mFLA8981WvE87DqtEkyjMZg1gIHqLDlg1F2+jIfNB+hN+7Nrk+rJHjJLdRThe7JcJ5kXN+i0f2QvTHiSMVraY/6i5nLDsNmXj1A7+WMIzhqn2pnN3MI4A4RwX0PhU34FONdeX20nHsmOn/3OC5iZNlc8QM1alWD524xMHWYRZwnkUE+qauaVniaV4fh9B3V/+M33mD6WbcIY919OcB0H17uCDF6n8ke0erikRazKBD56A+nKCRJlHThoyycp9AYyZYje9f3s4XyhiUdDRb6mZxGkvJfawzucf3OYO+Bxs9zq801u/6rP9qazMKwqFrYSXcwy3mz+zgt8k40mGSQP9sA8yoAYKhqKUBx1Nls080eQTou2oxmQ2STnpPdGo8Kr5tjWdg4ASz4b3OSZVB5MgIyeWMeOhSLsPfGBS3d3YiJgx9sQY7Zv2C7Rhp6+M2cbCQizUScfQO+faLl+p7earQWUwWoVFP97J9iNRC3KspP2GgLnQfiTYOQagANc8guhcpE7Q2DvltDdlECplnsR9toPSwntBgmuS97kBsSR3MPimY5eEJoyErBvLN0awrj+sdy6uNGdsdXx3p++hfNaAPehkrsgvbOmUVj7ZLUszeyU7OijrlDWzbrrFXvSPQSqQ/ZtUfEMEaYbIUxJeFN7xZpAXZod+5hcqLPqBxpPTz/tMmKipDk+U+NT55D8VfUD5NF1IKoXs+Olbt2lTHApgGPwCBQF6Lb3fJyjSEqhE+7G9UMjoRMysmpBevsM7GPNoEcJqBHx3sEuTdFAzevxugt1xbSZpaVKRg3jRHfc39absm0jJ1cKAcxk9dfJA==|920
+}//yEBJJyf1NUA2mur4TvpWoaa0Ynp4QKdS2S/wrqzYn82xqlkYUxwds3mh1vAl0SzrRNrD8C82GKE2v/DdNjfz/HG+tkzY4tXpaNjgeYA4JNQjjc3JBMaKHpLsay3Z/CmBEKe/0oINfd/NDuUYQx/4Q7Z/+5AladholeopA7EhaN4Hz3xS1i+YPThBIojdXLbSq8RHFYoQNyMDZqdQjGmrADcbTUe01H9mPcxqwBVh1UyA9ND7NBFBISpoaoT5vPm7ZM5Ovqzl27Ti45ezYYryY7CfJXyoosVFu9QUjTTKGTuRLuMsgENGYwTddU/k6fIz0PA2h8QMrPcQLHQWl1bZkVD3cC4+bX0I1/6Pu483avx7Hu3bvPMy8CvJkkJ/VI3g/SFpmrHb5j+RmRG7ZNAKg9RHep9zuijt24ME0TB2chY5WfdNmZPjPW4+s18dnPL1qUUiKAC54NWnyZTb94DRVuzGY1gJJB49jbf3OdBUfSD49HZL6lqboksAgkaZFAfGB5PddjpgLcSb4K2fv+zPeWV7fC9VlisafFoBBPFZ8XT7XwKghoU0KYCWJN/vwfXlxVKdELm8rfPsL/qOH0Dhg702IPxPVd/CdtmEe2mwZDTk8FpdIw97ymCVh84iNcIuBv4JKWt5yd0fY53ZZ8Nne9Ulj5hsoG0wwpI4deJrdI45Kozsr8hSb5/1LpJPzYrd4jCMVudbr6cv+RsekVesyugNavtyBQXswq3eLkV7drMHZpHoxpt/IlF5Uf1ABsviaIFzFmg6dk8mA+2Q2CdCMU28FWkwraH3GsTeYoHTPr/gWd55NKK36fmu4HyE2ktyiuJqXWmVP2rf8IJ93WjfobrLOp1CiIvouq7n5LFuesjxpD1j9Arg/F7unRK0Fb/fmN5D8c+mSU4un00Gjqy62w==|920

Pages/汇报/导入汇报数据.rd

@@ -1,6 +1,6 @@
 {
   "PageType": 0,
-  "ColumnCount": 35,
+  "ColumnCount": 31,
   "RowCount": 10,
   "CustomNames": [
     {

Pages/汇报/汇报详情.json

@@ -495,7 +495,7 @@
                             ]
                           }
                         ],
-                        "ID": "1ed0c68b-5796-420c-8766-bd84fb7c4fec"
+                        "ID": "45e1c075-7e6a-4566-ac12-3795b9869bc8"
                       },
                       {
                         "CommandList": [
@@ -510,12 +510,12 @@
                             "BtnText": "知道了"
                           }
                         ],
-                        "ID": "a2d23c36-2177-424d-a3aa-f88344d14092"
+                        "ID": "c8ec2b09-8ef9-49a5-84c9-b7a5d6e4eefb"
                       }
                     ]
                   }
                 ],
-                "ID": "c35f0d15-6ded-4cdb-8747-76200fa9097e"
+                "ID": "b02f35a1-4480-4543-b2a5-54e45099a1e6"
               },
               {
                 "CommandList": [
@@ -525,7 +525,7 @@
                     "Message": "请选择汇报日期"
                   }
                 ],
-                "ID": "1c3b537a-68f3-460e-b930-8ba6175a4178"
+                "ID": "a5daa381-34f6-4623-b793-dbd270593172"
               }
             ]
           }
@@ -657,7 +657,7 @@
                             }
                           }
                         ],
-                        "ID": "4267cd34-d691-4bdd-b49d-e6ddb2aaa481"
+                        "ID": "7b6a8bc1-3e2e-4a2e-98d1-a027679fd888"
                       },
                       {
                         "CommandList": [
@@ -672,12 +672,12 @@
                             "BtnText": "知道了"
                           }
                         ],
-                        "ID": "c4a5c5ab-faae-470f-a93a-7c5bf99a6b26"
+                        "ID": "e898ca70-8153-4116-838b-a7e555a718a0"
                       }
                     ]
                   }
                 ],
-                "ID": "20aaa4b9-a31c-4d9e-8bc0-304368e09f13"
+                "ID": "f7bb29d5-efea-4f0d-a441-bb68c0e19746"
               },
               {
                 "CommandList": [
@@ -687,7 +687,7 @@
                     "Message": "请在下方编写你的工作内容，让AI帮你完成左边的日报！"
                   }
                 ],
-                "ID": "3a9c80de-e110-43ef-a4b9-a37ddfbc1b53"
+                "ID": "8e7de297-3a41-410f-819e-767c385ff5a2"
               }
             ]
           }
@@ -864,14 +864,6 @@
               },
               "ColumnName": "关联任务"
             },
-            {
-              "BindingInfo": {
-                "TableName": "汇报子表",
-                "ColumnName": "关联项目",
-                "GUID": "f609f2cb-3b72-444c-8bdf-ff730c6abcab"
-              },
-              "ColumnName": "关联项目"
-            },
             {
               "Formula": {
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1018,7 +1010,7 @@
                             "ReloadData": true
                           }
                         ],
-                        "ID": "2917f64a-71fa-43d3-b7b6-ad185b089c4d"
+                        "ID": "5079bcad-ae33-493b-8cfb-0046f8211221"
                       },
                       {
                         "CommandList": [
@@ -1028,12 +1020,12 @@
                             "Message": "该日期已存在汇报，请前往列表中进行更新。"
                           }
                         ],
-                        "ID": "c9ee1fe9-0bbc-4d23-8e55-6d7d41009803"
+                        "ID": "40a258d2-cf19-465b-8a16-4a23c7761c39"
                       }
                     ]
                   }
                 ],
-                "ID": "494ef1aa-58a0-4e19-876d-6501148a8ecc"
+                "ID": "4d66724e-5282-4b3c-982a-f714711fb9f9"
               },
               {
                 "CommandList": [
@@ -1112,7 +1104,7 @@
                             "Message": "保存成功"
                           }
                         ],
-                        "ID": "09bacc9d-53ac-4d91-a099-82785e89ee4e"
+                        "ID": "d4e0e1b5-8708-49a6-82e5-5510594b1dc0"
                       },
                       {
                         "CommandList": [
@@ -1122,12 +1114,12 @@
                             "Message": "该日期已存在汇报，请前往列表中进行更新。"
                           }
                         ],
-                        "ID": "bae1662c-1438-4c66-877a-eae322ecf6e9"
+                        "ID": "76611ddc-2e5d-4b74-9366-afeb5933bf0b"
                       }
                     ]
                   }
                 ],
-                "ID": "11c9672d-ffba-4a8d-862c-2ae9aa008579"
+                "ID": "f868d27b-3f8d-4a93-b9f4-084b6f1cf1e5"
               }
             ]
           }
@@ -1456,6 +1448,7 @@
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+    "ShouldCheckDirty": true,
     "PermissionData": {
       "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
       "permissionResource": {
@@ -1495,4 +1488,4 @@
       "Formula": "汇报详情!$Q$13"
     }
   ]
-}//o67ujDVfiX0B9TFHQNP/T3o6IDq8WZNaKIBPhzMlbFszbKH+ZMYT8UvCAVuP3BlGaVgTFxT2mykc755wMxB3KU5I9vPkLXFEQQqZXpt8zqii2sM7Vy5mMSPrfHStrTiy2SRRyxD7bZ/Puxyt7Mr5TRpJJoSDI+bgXoQk6ef3j24+ZRCJy936BmJy6DA0kR5JRh9Kv6GFY8Thq77AT9M5dc4VCenM8cGilteNgwDlp01sOeELYeJ2BGDRuoxRJsaYlpFXqMTptMfWl5PXDcbgf1zuztW5VlSRlu/8xtc51irLiBXHe1lvWtiLtVcds6zd/D7KZ58BxN/N8TgeJTsXsq1kXDsdPRWxVWHPTfRp/wTE40s2apm/TFBHiqF64mB9meaHd5Bg+qbzGF9lJyVfD6IUg5H4JuxHZbTXzB1zX5vssb8l9D2+kP3dLhj3k44Hdo7681a2+yJ03n5pjen5taGQW5sai8C8eXwKCVrNXv5Ay1r5rYfX9jq1P6c2YlgHZKgMf920e/zUo5++IiKqkGNxx8q48Vbt4GUqFZmgMJIRzrEhijuNRw2KGTYQMyh7tkK4G1M/Zv+H1C43VpTZU0Alw01XDf7XrG51hGvGvMOT9YvCSNpLNrBPMHzBLZhwJWaGRj369tsjhGr41GR1JUK80LuKcYu7wIPCSvIL+eZ+GEUH5yle6blDwIKdEgoL2kvdSJ7y60CbLYUJpyUZXTkmbvJMPsyEnAEVu3f8GxOJC+/NUmS2aN0j9sdMmhUSild+CkHfpjRxd8NpNwNGudhm9ZcbvkZDc4DLg/NWgOb1Prf7XnVD1qKZOLwrK/oodd35pZwJXEtSnx8vXfMV47lHXbEIb4hS1IhPzZtVVvWXC2EOJ0Zd3G8CrOTIpNIgDkojwgBCYqu+HbG7JURuSg==|920
+}//3L372o5H7piKyVq0RxIgq14yfSYO4Oi7uxdwt4vLYWYfl1KX8cfj0NlWGHEoCDvKRH7VdTFqkD8WjpwBtVxpFnVF9KmP6+GThjnDHy/wa+EQJ1+4uTTIcFu23516wrJDXdBrp+ycO7e5U/UbW53BqfoHcjz2ryopFaCOCbge8JZXFwEeBcBCaW0vum65QVlrE6YfGYU0LabSmiPSf9W/YeotF/sJEdf1EGD6BBHyR1LByrkpxsnNhGa+zcTLAyAPrwRFFS0zp8K/6POkqYcomGjITxHr43iGhBBaF6f3sgTABASXuq9iEs41Jczj+OGGlx1JPIUxVvPYRuWm4IjZMSWB+nCyiI64e5fccd9NKCGQuWzWg/NoSdlyeWRTxwRuI+szHmUHxOCdFlOSOuk2IpBCDuQeqQU4D8gLpZ/azSiYbz9/539rw9zHfU95RFy+VnxiVqBuTlEzb+KhKHyfGEjS7/93wrvl+WlgIuRyUdGhjwzcxCN0abl62CD8dZKdZXSAj6RiBOJfp0d0ObROYHJU/cCE4rp88xCTnKojkhwc9sBrrU2rN/EKAFnD2oC4tLtWq4pvJGB0xnbAj9J3H9XTrarUBbvL/HS+KGimRL5wAo6v7ZEF0zDTv2E41Q63ulmjB6Nt9LOf0MY/46MoBXNNMo0znhw7wGpLHRHb+RzAlHdhUbrREim7Vp1SOawmE77jOnRPnq8sMi/h1AkqrZDtR6CtiW7/9fCbmvR+SXslew/HuCvFAoeIO15Yrc+i9N12vfhfkTSbLLAiqd9WH02fo6yY559ZakoHdGnUEuJdT4g3fEVqF19TlaTP8JPmh8yMtlBkVqdqTKP+ONXnPYoAwNOe9z2lCao6fMV4lnOSlUUFZnpcodQmgayB1XQsmEU7mxpjEB/5/u49fH52ww==|920