Merge branch '04/16vipactiveRange' into test

src/views/categroyManager/vipActiveList.vue

@@ -398,7 +398,10 @@
             <div>
               <div
                 class="head"
-                @click="()=>{this.$refs['form'].resetFields();activeType = 'BASE_ACTIVITY'}"
+                @click="()=>{this.$refs['form'].resetFields();activeType = 'BASE_ACTIVITY'; courseNumForm = {
+                    minCourseNum: null,
+                    maxCourseNum: null,
+                  };}"
                 :class="activeType == 'BASE_ACTIVITY' ? 'active' : ''"
               >
                 基础活动
@@ -425,13 +428,12 @@
                 :model="courseNumForm"
                 :inline="true"
                 ref="form"
-                :rules="activeType == 'DISCOUNT'?courseNumrules:[]"
+                :rules="activeType == 'DISCOUNT'?courseNumrules:{}"
                 v-show="activeType == 'DISCOUNT'"
               >
                 <el-form-item prop="minCourseNum">
                   <el-input
                     @change="handleMinChange"
-
                     v-model.number="courseNumForm.minCourseNum"
                     type="number"
                     style="margin-left: 10px; width: 120px !important"
@@ -455,7 +457,10 @@
             <div>
               <div
                 class="head"
-                @click="()=>{this.$refs['form'].resetFields();activeType = 'GIVE_CLASS'}"
+                @click="()=>{this.$refs['form'].resetFields();activeType = 'GIVE_CLASS'; courseNumForm = {
+                    minCourseNum: null,
+                    maxCourseNum: null,
+                  };}"
                 :class="activeType == 'GIVE_CLASS' ? 'active' : ''"
               >
                 赠送课时
@@ -1073,7 +1078,7 @@ export default {
       this.$refs["vipform"].resetFields();
       this.dialogVisible = false;
     },
-    resetForm() {
+    resetForms() {
       this.$refs.form.resetFields();
     },
     handleMinChange() {

src/views/categroyManager/vipNewActive.vue

@@ -21,33 +21,39 @@
         <el-form-item label="活动名称" prop="name">
           <el-input style="width: 400px" v-model.trim="vipform.name"></el-input>
         </el-form-item>
-        <el-form-item label="适用分部"
-                      prop="organ">
-          <select-all v-model.trim="vipform.organ"
-           style="width:400px"
-                     multiple
-                     filterable
-                     @visible-change="$forceUpdate()"
-                     @change="onOrganChange"
-                     clearable>
-            <el-option v-for="(item,index) in selects.branchs"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+        <el-form-item label="适用分部" prop="organ">
+          <select-all
+            v-model.trim="vipform.organ"
+            style="width: 400px"
+            multiple
+            filterable
+            @visible-change="$forceUpdate()"
+            @change="onOrganChange"
+            clearable
+          >
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </select-all>
           <!-- <el-button @click="onCheckAllBranch">适用所有分部</el-button> -->
         </el-form-item>
-        <el-form-item label="课程形式"
-                      prop="stauts">
-          <select-all v-model.trim="vipform.stauts"
-                       style="width:400px"
-                     @visible-change="$forceUpdate()"
-                     clearable
-                     multiple>
-            <el-option v-for="item in selects.vipGroupCategory"
-                       :key="item.id"
-                       :value="item.id"
-                       :label="item.name"></el-option>
+        <el-form-item label="课程形式" prop="stauts">
+          <select-all
+            v-model.trim="vipform.stauts"
+            style="width: 400px"
+            @visible-change="$forceUpdate()"
+            clearable
+            multiple
+          >
+            <el-option
+              v-for="item in selects.vipGroupCategory"
+              :key="item.id"
+              :value="item.id"
+              :label="item.name"
+            ></el-option>
           </select-all>
         </el-form-item>
         <el-form-item label="活动描述" prop="desc">
@@ -215,7 +221,16 @@
             <div
               class="head"
               :class="activeType == 'BASE_ACTIVITY' ? 'active' : ''"
-               @click="()=>{this.$refs['form'].resetFields();activeType = 'BASE_ACTIVITY'}"
+              @click="
+                () => {
+                  this.$refs['form'].resetFields();
+                  activeType = 'BASE_ACTIVITY';
+                  courseNumForm = {
+                    minCourseNum: null,
+                    maxCourseNum: null,
+                  };
+                }
+              "
             >
               基础活动
             </div>
@@ -241,13 +256,12 @@
               :model="courseNumForm"
               :inline="true"
               ref="form"
-               v-show="activeType == 'DISCOUNT'"
-              :rules="activeType == 'DISCOUNT'?courseNumrules:[]"
+              v-show="activeType == 'DISCOUNT'"
+              :rules="activeType == 'DISCOUNT' ? courseNumrules : {}"
             >
               <el-form-item prop="minCourseNum">
                 <el-input
                   @change="handleMinChange"
-
                   v-model.number="courseNumForm.minCourseNum"
                   type="number"
                   style="margin-left: 10px; width: 120px !important"
@@ -271,7 +285,16 @@
             <div
               class="head"
               :class="activeType == 'GIVE_CLASS' ? 'active' : ''"
-             @click="()=>{this.$refs['form'].resetFields();activeType = 'GIVE_CLASS'}"
+              @click="
+                () => {
+                  this.$refs['form'].resetFields();
+                  activeType = 'GIVE_CLASS';
+                      courseNumForm = {
+                    minCourseNum: null,
+                    maxCourseNum: null,
+                  };
+                }
+              "
             >
               赠送课时
             </div>

src/views/main/constant.js

@@ -234,7 +234,8 @@ export const errorType = {
     permission: '/serverDetail',
     query: {
       searchType: 'TEACHER_SERVE_ERROR',
-      unDone:1
+      unDone:1,
+      reminded: 0
     },
   }
 }

src/views/serverDetail/index.vue

@@ -59,8 +59,8 @@
             clearable
             placeholder="是否提醒"
           >
-            <el-option label="是" :value="1"></el-option>
-            <el-option label="否" :value="0"></el-option>
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="operatorId">
@@ -289,6 +289,7 @@ export default {
       if (this.$route.query.searchType) {
         this.searchForm.organId = this.$route.query.organId * 1 || "";
         this.searchForm.unDone = this.$route.query.unDone+'' || ""
+         this.searchForm.reminded = this.$route.query.reminded+'' || ""
         const dayjs = this.$helpers.dayjs;
         let nowDate = dayjs(new Date()).format("YYYY-MM-DD");
         this.orderDate = [