Merge branch 'ol_12_30' into 11/24SAAS

src/views/main/abnormal/index.vue

@@ -24,7 +24,6 @@
       </el-form-item>
       <el-button native-type="submit" type="primary">搜索</el-button>
       <el-button native-type="reset" type="danger">重置</el-button>
-
     </save-form>
     <div class="tags">
       <el-badge
@@ -51,6 +50,31 @@
       type="text"
     >
       <title-item
+        v-if="item[0].errorType != 'HAS_FREE_COURSE_TIMES'"
+        :descss="descs"
+        :type="item[0].isError ? 'error' : 'warning'"
+        :data="
+          item.map((title) => ({
+            name: title.desc,
+            num: title.num,
+            num2: title.num2,
+            errorType: title.errorType,
+          }))
+        "
+      >
+        <span
+          style="color: var(--color-primary)"
+          v-if="
+            !errorType[item[0].errorType] ||
+            (errorType[item[0].errorType] &&
+              permission(errorType[item[0].errorType].permission))
+          "
+        >
+          立即处理<i class="el-icon-d-arrow-right" />
+        </span>
+      </title-item>
+      <title-item
+         v-if="item[0].errorType == 'HAS_FREE_COURSE_TIMES' && permission('HAS_FREE_COURSE_TIMES')"
         :descss="descs"
         :type="item[0].isError ? 'error' : 'warning'"
         :data="
@@ -184,9 +208,8 @@ export default {
     },
   },
   async mounted() {
-
     await this.$store.dispatch("setBranchs");
-  // this.$set(this.search,'organId',this.selects.branchs[0].id)
+    // this.$set(this.search,'organId',this.selects.branchs[0].id)
     this.FetchList();
   },
   methods: {
@@ -267,10 +290,8 @@ export default {
                 "COURSE_TIME_ERROR"
               ] = `上课时间不在${startStr}~${endStr}时间段内为时间安排异常`;
             }
-            if(leaveStr){
-               this.descs[
-                "STUDENT_ERROR_LEAVE"
-              ] = `当月请假${leaveStr}次及以上`;
+            if (leaveStr) {
+              this.descs["STUDENT_ERROR_LEAVE"] = `当月请假${leaveStr}次及以上`;
             }
           } catch (e) {
             console.log(e);

src/views/setQuestions/questionManger/component/Continuous.vue

@@ -117,17 +117,17 @@
 
                 <div v-if="item['type'] == 'image'">
                   <van-uploader
-                    v-model="list[item.id]"
+                    v-model="list[item.ids]"
                     :max-count="1"
                     :before-delete="
                       (file) => {
-                        beforeDelete(file, item.id + '', item.id);
+                        beforeDelete(file, item.ids + '', item.ids);
                       }
                     "
                     :before-read="beforeRead"
                     :after-read="
                       (file) => {
-                        afterRead(file, item.id, item.id);
+                        afterRead(file, item.ids, item.ids);
                       }
                     "
                     accept="image/*"
@@ -177,8 +177,8 @@
           <div v-if="item['type'] == 'textarea'">
             <!--  class="textareaClass" -->
             <van-field
-              v-model="form[item.id]"
-              :name="item.id + ''"
+              v-model="form[item.ids]"
+              :name="item.ids + ''"
               :rules="[
                 {
                   required: item['isRequire'] ? true : false,
@@ -299,7 +299,7 @@ export default {
       checkList: [],
       templateType: 2,
       questionList: [{ type: "", content: "" }],
-      list: "",
+      list:[],
       forms:{}
     };
   },
@@ -449,7 +449,7 @@ export default {
       return true;
     },
     async afterRead(file, name, origin) {
-      this.setLoading(true);
+      // this.setLoading(true);
       let formData = new FormData();
       formData.append("file", file.file);
       try {
@@ -463,9 +463,9 @@ export default {
             return false;
           }
         });
-        this.setLoading(false);
+        // this.setLoading(false);
       } catch (err) {
-        this.setLoading(false);
+        // this.setLoading(false);
         return false;
       }
     },

src/views/setQuestions/questionManger/component/Progressive.vue

@@ -285,7 +285,6 @@ export default {
   async mounted() {
     this.templateType = this.form.templateType;
     this.questionList = this.form.questionnaireQuestionList;
-    console.log(this.form);
   },
   computed: {
     planStatus() {