1

src/pages/financial/orderCompleteStatistics.vue

@@ -138,10 +138,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="下单时间：">
+              <el-date-picker class="h34"  v-model="datevalue" type="daterange"
+              value-format="yyyy-MM-dd"  range-separator="至"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="消费课时：">
+              <el-date-picker class="h34"  v-model="datevalue2" type="daterange"
+              value-format="yyyy-MM-dd"  range-separator="至"></el-date-picker>
+            </el-form-item>
+          </el-col>
+         
           <el-col :span="5">
             <el-form-item >
             <!-- <button class="normalBtn " @click="getData()">查询</button> -->
-            <q-btn color="primary" size="11px" label="查询" @click="getData()" style="marginRight:10px"/>
+            <q-btn color="primary" size="11px" label="查询" @click="handleCurrentChange(1)" style="marginRight:10px"/>
             <!-- <button class="normalBtn " @click="exportExcel">导出EXCEL</button> -->
             <q-btn color="primary" size="11px" label="导出EXCEL" @click="exportExcel"/>
             </el-form-item>
@@ -345,8 +358,14 @@
           FinanceId:0,//财务单据id
           TradeWay:0,//交易方式
           AccountId:0,//账号id
-          AccountType:0//账户类型
+          AccountType:0,//账户类型
+          StartTime:'',//下单时间
+          EndTime:'',    
+          XFStartTime:'',//消费课时时间
+          XFEndTime:'', 
         },
+        datevalue:[],
+        datevalue2:[],
         data: [],
         DataList: [],
         UpdateStaus: 0,
@@ -392,6 +411,20 @@
    
      
       getData(){
+          if (this.datevalue && this.datevalue.length > 0) {
+            this.msg.StartTime = this.datevalue[0];
+            this.msg.EndTime = this.datevalue[1];
+          }else{
+            this.msg.StartTime = '';
+            this.msg.EndTime = '';
+          }
+          if (this.datevalue2 && this.datevalue2.length > 0) {
+            this.msg.XFStartTime = this.datevalue2[0];
+            this.msg.XFEndTime = this.datevalue2[1];
+          }else{
+            this.msg.XFStartTime = '';
+            this.msg.XFEndTime = '';
+          }
           getOrderCompleteStatisticsPageList(this.msg).then((res)=>{
               res.Data.PageData.map((item)=>{
                 item.Progress=item.Progress+"%"