Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/school-center/salesList/salesList.vue

src/views/school-center/louZhang/managerKpi.vue

@@ -18,6 +18,7 @@
                                     :value="queryParam.month"
                                     :mode="tempMode"
                                     @panelChange="handlePanelChange"
+                                    @change="handleChange"
                                     style="width: 16rem;"
                             />
                         </a-form-item>
@@ -208,6 +209,10 @@
                 this.tempMode = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
                 //console.log("this.tempMode=================="+this.tempMode);
             },
+            handleChange(value) {
+                this.queryParam.month = []
+                console.log(value)
+            },
             excelOut() {
                 let params = {
                     pageNo: 1,

src/views/school-center/louZhang/zjlSalary.vue

@@ -18,6 +18,7 @@
                                     :value="queryParam.month"
                                     :mode="tempMode"
                                     @panelChange="handlePanelChange"
+                                    @change="handleChange"
                                     style="width: 16rem;"
                             />
                         </a-form-item>
@@ -247,6 +248,10 @@
                 this.tempMode = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
                 //console.log("this.tempMode=================="+this.tempMode);
             },
+            handleChange(value) {
+                this.queryParam.month = []
+                console.log(value)
+            },
             excelOut() {
                 let params = {
                     pageNo: 1,

src/views/school-center/salesList/saleCensus.vue

@@ -56,6 +56,7 @@
                                     :value="queryParam.activateTime"
                                     :mode="tempMode"
                                     @panelChange="handlePanelChange"
+                                    @change="handleChange"
                                     style="width: 16rem;"
                             />
                         </a-form-item>
@@ -217,7 +218,7 @@
                     {dataIndex: 'account', width: 30, title: '账号', align: "center"},
                     {dataIndex: 'salesSubst', width: 15, title: '县分', align: "center"},
                     {dataIndex: 'salesSchool', width: 30, title: '学校', align: "center"},
-                    {dataIndex: 'num', width: 30, title: '达标充值数', align: "center"},
+                    {dataIndex: 'recentlyNum', width: 30, title: '达标充值数', align: "center"},
                     {dataIndex: 'position', width: 30, title: '职位', align: "center"},
                     {dataIndex: 'leader', width: 30, title: '上级领导', align: "center"},
                     /*{
@@ -271,6 +272,10 @@
                 this.tempMode = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
                 //console.log("this.tempMode=================="+this.tempMode);
             },
+            handleChange(value) {
+                this.queryParam.activateTime = []
+                console.log(value)
+            },
             search() {
                 this.$refs.table.refresh({search: true})
             },