Merge branch 'zcwy-0415' into dev0223

src/views/projectcenter/TaskPage.vue

@@ -2646,11 +2646,11 @@ export default {
           ellipsis: true,
           customRender: ({ record }) => (
             <div>
-              {record.status == 0
-                ? "未开始"
+              {record.stuStatus == 2
+                ? "进行中"
                 : record.status == 1
                 ? "已完成"
-                : "进行中"}
+                : "未开始"}
             </div>
           ),
         },
@@ -3452,6 +3452,7 @@ export default {
     };
     //修改备注
     const modifyRemarks = (record) => {
+      state.remarks = record.batch
       state.remarksId = record.id
       state.showRemarks = true;
     }