Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/LeaderManagement/leaderPerformance.vue

@@ -306,7 +306,7 @@
           </span>
           <span v-else-if="msg.Type==2">
             <em>月份：</em>
-            <el-date-picker v-model="msg.MonthStr" type="month" value-format="yyyy-MM" placeholder="选择月">
+            <el-date-picker v-model="msg.MonthStr2" type="month" value-format="yyyy-MM" placeholder="选择月">
             </el-date-picker>
           </span>
           <span v-else>
@@ -537,6 +537,7 @@
           pageSize: 10,
           Type: 2,
           MonthStr: "",
+          MonthStr2:'',
           //领队类型
           QLeaderType: 0,
           Year: 0,
@@ -575,9 +576,13 @@
           QMonthStr: this.msg.MonthStr,
           ShoppingID: this.msg.ShoppingID
         };
-        if (msg.Type == 4 || msg.Type == 5 || msg.Type == 7) {
+        if(msg.Type==2){
+          msg.QMonthStr = this.msg.MonthStr2;
+        }
+        if (msg.Type != 2 && msg.Type != 3 && msg.Type != 6) {
           msg.QMonthStr = this.msg.Year + "-" + this.msg.Month;
         }
+
         this.Champion = [];
         this.yajun = [];
         this.jijun = [];