Merge branch 'master' of https://git.czcyedu.com/huoran/FE_occupationlab_server into master

src/pages/achievement/list/index.vue

@@ -10,6 +10,7 @@
                     </el-radio-group>
                     <el-date-picker
                         v-model="date"
+                        @blur='pickerInput'
                         align="right"
                         unlink-panels
                         type="daterange"
@@ -158,6 +159,7 @@ export default {
             } else {
                 this.startingtime = "";
                 this.endTime = "";
+                this.month = '';
             }
             this.initData();
         },
@@ -181,6 +183,9 @@ export default {
         this.getClassData();
     },
     methods: {
+        pickerInput(){
+            this.month = '6'
+        },
         getschoolCourse() { // 获取课程下拉框数据
             this.$get(this.api.schoolCourse).then(res => {
                 if (res.data && res.data.length) {

src/pages/assessment/list/index.vue

@@ -8,7 +8,7 @@
                     <el-radio-group v-model="form.month" @change="initData">
                         <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{ item.name }}</el-radio>
                     </el-radio-group>
-                    <el-date-picker v-model="date" align="right" unlink-panels type="daterange" style="width: 300px;margin-left: 10px;" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable></el-date-picker>
+                    <el-date-picker v-model="date" @blur='pickerInput' align="right" unlink-panels type="daterange" style="width: 300px;margin-left: 10px;" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable></el-date-picker>
                 </li>
                 <li>
                     <label>发布类型</label>
@@ -204,10 +204,10 @@ export default {
             if (val) {
                 this.form.startTime = val[0];
                 this.form.endTime = val[1];
-                // this.form.month = ''
             } else {
                 this.form.startTime = "";
                 this.form.endTime = "";
+                this.form.month = '';
             }
             this.initData();
         },
@@ -229,6 +229,10 @@ export default {
         this.getschoolCourse();
     },
     methods: {
+        pickerInput(){
+            console.log(this.date)
+            this.form.month = '6'
+        },
         beginTimer() {
             this.ticker = setInterval(() => {
                 if(this.sss == 0){