Merge remote-tracking branch 'origin/develop' into develop

src/components/drawers/AddOpenCourse.vue

@@ -531,9 +531,9 @@ const createNewCourse = () => {
     offcourseId: params.value.offcourseId,
     draftTaskId: params.value.draftTaskId,
   });
-  onceName.value = "";
   dateTime.value = [];
   validated.value = 0;
+  onceName.value = "";
   offCourseNewVisiable.value = true;
 };
 const handleCancelStu = () => offCourseNewVisiable.value = false;
@@ -576,6 +576,7 @@ async function coursePlanConfirm() {
 }
 
 function planEdit(record) {
+  onceName.value = record.name;
   formData.value = { ...record };
   validated.value = 0;
   formData.value.homeWorkId && request(WORK_DETAIL(formData.value.homeWorkId), {}).then(res => formData.value.workInfo = res.data);
@@ -590,7 +591,6 @@ function openDrawer(row) {
   params.value.draftTaskId = row.id;
   formData.value.offcourseId = row.courseId;
   formData.value.draftTaskId = row.id;
-  onceName.value = row.name;
   courseName.value = row.name;
   nextTick(tableRef.value.fetch);
 }

src/components/drawers/project/ProjectFaceTaskManage.vue

@@ -242,7 +242,7 @@ const columns = ref([
     align: "center",
     ellipsis: true,
     className: "h",
-    customRender: ({ record: { workScore } }) => <span> {workScore || "-"}</span>
+    customRender: ({ record: { workScore } }) => <span> {workScore!==-2?workScore:"-" || "-"}</span>
   },
   {
     title: "考试成绩",