年份学期必填

src/views/pms/product/components/courseInfo.vue

@@ -1037,29 +1037,46 @@ export default {
       });
       });
     },
     },
     submitGoOnForm() {
     submitGoOnForm() {
-      this.$confirm("是否要提交", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        this.goOnForm.umsUserCourses = this.goOnForm.userCourseList; //新来的后端比较菜，原来的接口字段不会改，只能搞了个新的名字
-        this.goOnForm.umsUserCourses.forEach(item => {
-          item.courseName = item.auditCourseName;
-        });
-        addCurrentTermCourse(this.goOnForm).then(response => {
+      this.goOnForm.userCourseList.forEach(item => {
+        if (!item.yearTime || !item.term) {
           this.$message({
           this.$message({
-            type: "success",
-            message: "提交成功",
+            type: "error",
+            message: "请填写年份学期",
             duration: 1000
             duration: 1000
           });
           });
-          this.courseInfoVisible = false;
-          this.editCourseInfoVisible = false;
-          this.editCourseTitleVisible = false;
-          this.goOnVisible = false;
-          this.getCourseList();
-          this.$forceUpdate();
-        });
+          //   console.log("NO");
+          this.isOK = false;
+        } else {
+          //   console.log("OK");
+          this.isOK = true;
+        }
       });
       });
+
+      if (this.isOK) {
+        this.$confirm("是否要提交", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.goOnForm.umsUserCourses = this.goOnForm.userCourseList; //新来的后端比较菜，原来的接口字段不会改，只能搞了个新的名字
+          this.goOnForm.umsUserCourses.forEach(item => {
+            item.courseName = item.auditCourseName;
+          });
+          addCurrentTermCourse(this.goOnForm).then(response => {
+            this.$message({
+              type: "success",
+              message: "提交成功",
+              duration: 1000
+            });
+            this.courseInfoVisible = false;
+            this.editCourseInfoVisible = false;
+            this.editCourseTitleVisible = false;
+            this.goOnVisible = false;
+            this.getCourseList();
+            this.$forceUpdate();
+          });
+        });
+      }
     },
     },
     cancel(formName) {
     cancel(formName) {
       this.courseInfoVisible = false;
       this.courseInfoVisible = false;

src/views/pms/product/newGpaPdf.vue

@@ -39,12 +39,7 @@
             </p>
             </p>
             <p>
             <p>
               <!-- {{ list.term.slice(0, 1).toUpperCase() + list.term.slice(1) }} -->
               <!-- {{ list.term.slice(0, 1).toUpperCase() + list.term.slice(1) }} -->
-              {{
-                list.term
-
-                  .toLowerCase()
-                  .replace(/( |^)[a-z]/g, L => L.toUpperCase())
-              }}
+              {{ list.term.replace(/( |^)[a-z]/g, L => L.toUpperCase()) }}
               {{ list.yearTime }}
               {{ list.yearTime }}
             </p>
             </p>
             <!-- <p>{{ list.yearTime }}</p> -->
             <!-- <p>{{ list.yearTime }}</p> -->