no message

src/components/stuMan/eventsCalendar.vue

@@ -344,6 +344,11 @@ export default {
   },
   data() {
     return {
+        pickerOptions: {
+          disabledDate: time => {
+            return time.getTime() < Date.now() - 8.64e7;
+          }
+        },
         date:'',
         value: new Date(),
         calendarData:[],

src/components/work/index.vue

@@ -127,7 +127,7 @@
       </div> -->
       <q-btn-group
         outline
-        style="position: fixed;top: 15px;right:20px;z-index: 666666;"
+        style="position: fixed;top: 75px;right:20px;z-index: 666666;"
       >
         <q-btn
           dense

src/pages/Work.vue

@@ -271,7 +271,7 @@ export default {
 .sub-header {
   position: fixed;
   height: 56px;
-  top: 0;
+  top: 60px;
   left: 0;
   right: 0;
   transition: top 0.3s ease;

src/pages/financial/reportform/performanceCommission.vue

 <style scoped>
 @import "../css/cssReset.css";
+.January{
+  background-color: #B3E5FC;
+}
+.February{
+  background-color: #C8E6C9;
+}
+.March{
+  background-color: #FFCCD2;
+}
+.April{
+  background-color: #F8DDE0;
+}
+.May{
+  background-color: #E1BEE7;
+}
+.June{
+  background-color: #D1C4E9;
+}
+.July{
+  background-color: #C5CAE9;
+}
+.August{
+  background-color: #F0F4C3;
+}
+.September{
+  background-color: #FFF9C4;
+}
+.October{
+  background-color: #FFECB3;
+}
+.November{
+  background-color: #FFE0B2;
+}
+.December{
+  background-color: #FFCCBC;
+}
 .singeRowTable tr:nth-child(2n + 1) {
   background: none;
 }
@@ -85,17 +121,18 @@
         <div class="col-3">
           <q-field filled dense>
             <template v-slot:control>
-              <el-date-picker
-                v-model="dateArray"
-                size="mini"
-                @change="resetSearch"
-                value-format="yyyy-MM"
-                type="daterange"
-                style="border:none;"
-                range-separator="至"
-                start-placeholder="跟进开始时间"
-                end-placeholder="跟进结束时间"
-              />
+              <el-date-picker v-model="dateArray[0]" style="width:100%" value-format="yyyy-MM" @change="resetSearch()"
+                size="small" type="month" placeholder="选择开始年月">
+              </el-date-picker>
+            </template>
+          </q-field>
+        </div>
+        <div class="col-3">
+          <q-field filled dense>
+            <template v-slot:control>
+              <el-date-picker v-model="dateArray[1]" style="width:100%" value-format="yyyy-MM" @change="resetSearch()"
+                size="small" type="month" placeholder="选择结束年月">
+              </el-date-picker>
             </template>
           </q-field>
         </div>
@@ -129,11 +166,23 @@
               style="min-width: 500px;"
               v-for="(item, index) in RListlength"
               :key="index"
+              :class="item.Month.slice(6)==1?'January':
+              (item.Month.slice(6)==2?'February':
+              (item.Month.slice(6)==3?'March':
+              (item.Month.slice(6)==4?'April':
+              (item.Month.slice(6)==5?'May':
+              (item.Month.slice(6)==6?'June':
+              (item.Month.slice(6)==7?'July':
+              (item.Month.slice(6)==7?'August':
+              (item.Month.slice(6)==7?'September':
+              (item.Month.slice(5)==10?'October':
+              (item.Month.slice(5)==11?'November':
+              (item.Month.slice(5)==12?'December':'')))))))))))"
             >
               <span v-if="item.Month.slice(5) < 10">{{
                 item.Month.slice(6)
               }}</span>
-              <span v-else>{{ item.Month.slice(6) }}</span
+              <span v-else>{{ item.Month.slice(5) }}</span
               >月
             </th>
             <th width="120" rowspan="2" style="min-width: 110px;">提成合计</th>
@@ -541,6 +590,14 @@ export default {
       });
     },
     resetSearch() {
+      if(!this.dateArray[0]||!this.dateArray[1]){
+        this.$q.notify({
+          type: 'negative',
+          position: "top",
+          message: `请选择开始和结束时间`
+        })
+        return
+      }
       this.msg.pageIndex = 1;
       this.getList();
     },