Merge branch 'fiveadd' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into five-second-add

src/components/tableList.vue

@@ -895,6 +895,8 @@
                 ? "未通过"
                 : scope.row[item.prop] === 1
                 ? "通过"
+                : scope.row[item.prop] === 3
+                ? "审核中"
                 : ""
             }}
           </span>
@@ -911,6 +913,8 @@
                 ? "未通过"
                 : scope.row[item.prop] === 2
                 ? "通过"
+                : scope.row[item.prop] === 3
+                ? "审核中"
                 : ""
             }}
           </span>

src/views/education/classManageMent/classHours/index.vue

@@ -334,6 +334,13 @@ export default {
         this.$message.warning("请勾选需要学时信息推送的学员");
         return;
       }
+      let stu = this.$refs.tableList.allCheckData.some((item) => {
+        return item.periodStatus === -1;
+      });
+      if (stu) {
+        this.$message.warning("所勾选学员的学时审批状态不允许为不可审核状态");
+        return;
+      }
       let arr = this.$refs.tableList.allCheckData.map((item) => {
         return {
           userId: item.userId,

src/views/education/classManageMent/studentMenu/index.vue

@@ -750,13 +750,6 @@ export default {
         this.$message.warning("请勾选需要官方信息推送的学员");
         return;
       }
-      let stu = this.$refs.tableList.allCheckData.some((item) => {
-        return item.periodStatus === -1;
-      });
-      if (stu) {
-        this.$message.warning("所勾选学员的学时审批状态不允许为不可审核状态");
-        return;
-      }
       let arr = this.$refs.tableList.allCheckData.map((item) => {
         return {
           userId: item.userId,