Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into dev

src/views/education/classManageMent/classList/classList/addClass.vue

@@ -560,9 +560,9 @@ export default {
         classGradeGoodsAddBos: [],
         studentUpper: 1000000,
       };
-      this.$nextTick(()=>{
-        this.$refs.listData.clearValidate()
-      })
+      this.$nextTick(() => {
+        this.$refs.listData.clearValidate();
+      });
       this.getInfoCityDict();
       this.getGoodsList();
       this.getGFList();
@@ -707,7 +707,11 @@ export default {
     changeClassStatus() {
       this.listData.officialName = "";
       this.listData.timeList = [];
-      this.listData.pastDueDay = 0;
+      if (this.listData.classStatus == 1) {
+        this.listData.pastDueDay = 10;
+      } else {
+        this.listData.pastDueDay = null;
+      }
     },
     //返回
     backPage() {
@@ -745,15 +749,15 @@ export default {
       if (!data.timeList) {
         data.classStartTime = null;
         data.classEndTime = null;
-        data.pastDueDay = null
+        data.pastDueDay = null;
       }
       if (data.learningStatus === 3) {
         data.learningTimeStart = this.listData.learningTimeStart / 1000;
       }
       this.$api.appGradegrade(data).then((res) => {
         this.$message.success("添加成功");
-        this.$emit("backFunc")
-        this.isShow = false
+        this.$emit("backFunc");
+        this.isShow = false;
       });
     },
     //商品列表
@@ -776,11 +780,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.col_12{
-  border-right:1px solid #e1e1e1;
+.col_12 {
+  border-right: 1px solid #e1e1e1;
 }
-/deep/ .el-input--medium .el-input__inner{
-  width:405px;
+/deep/ .el-input--medium .el-input__inner {
+  width: 405px;
 }
 /deep/.el-button {
   border-radius: 8px;

src/views/education/classManageMent/classList/manageClass/baseInfo.vue

@@ -630,7 +630,11 @@ export default {
       this.listData.officialName = "";
       this.listData.classStartTime = "";
       this.listData.classEndTime = "";
-      this.listData.pastDueDay = 0;
+      if (this.listData.classStatus == 1) {
+        this.listData.pastDueDay = 10;
+      } else {
+        this.listData.pastDueDay = null;
+      }
       this.$nextTick(() => {
         this.$refs.listData.clearValidate();
       });
@@ -660,7 +664,7 @@ export default {
       if (!data.classStartTime && !data.classEndTime) {
         data.classStartTime = null;
         data.classEndTime = null;
-        data.pastDueDay = null
+        data.pastDueDay = null;
       } else {
         if (data.classStartTime && data.classEndTime) {
           data.classStartTime = data.classStartTime / 1000;

src/views/education/classManageMent/classList/trainee/index.vue

@@ -159,9 +159,9 @@ import ClassHour from "@/views/education/archives/archivesDetails/courseRecords/
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
-import pictureList from "@/components/Comon/pictureList.vue";
 import tabClassDialog from "./tabClassDialog.vue";
 import changeClassDialog from "./changeClassDialog.vue";
+import pictureList from "@/components/Comon/pictureList.vue";
 export default {
   components: {
     pictureList,