| 
														
															@@ -37,7 +37,7 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 v-model="queryParams.labelId" 
														 | 
														
														 | 
														
															                 v-model="queryParams.labelId" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               > 
														 | 
														
														 | 
														
															               > 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 <option :value="undefined" selected>全部</option> 
														 | 
														
														 | 
														
															                 <option :value="undefined" selected>全部</option> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                <option :value="ele.id" v-for="ele in labelList" :key="ele.id">{{ele.labelName}}</option>               
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                <option :value="ele.id" v-for="ele in labelList" :key="ele.id">{{ele.labelName}}</option> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               </select> 
														 | 
														
														 | 
														
															               </select> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             </div> 
														 | 
														
														 | 
														
															             </div> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           </div> 
														 | 
														
														 | 
														
															           </div> 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -47,7 +47,7 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               <div class="input-group-prepend"> 
														 | 
														
														 | 
														
															               <div class="input-group-prepend"> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 <span class="input-group-text" id="addon-wrapping">日期:</span> 
														 | 
														
														 | 
														
															                 <span class="input-group-text" id="addon-wrapping">日期:</span> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 <el-date-picker 
														 | 
														
														 | 
														
															                 <el-date-picker 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                  v-model="queryParams.data" 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                  v-model="searchParams.data" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                   type="datetimerange" 
														 | 
														
														 | 
														
															                   type="datetimerange" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                   value-format="yyyy-MM-dd HH:mm:ss" 
														 | 
														
														 | 
														
															                   value-format="yyyy-MM-dd HH:mm:ss" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                   size="mini" 
														 | 
														
														 | 
														
															                   size="mini" 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -226,7 +226,7 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               <div class="input-group-prepend"> 
														 | 
														
														 | 
														
															               <div class="input-group-prepend"> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 <span class="input-group-text" id="addon-wrapping">时间:</span> 
														 | 
														
														 | 
														
															                 <span class="input-group-text" id="addon-wrapping">时间:</span> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 <el-date-picker 
														 | 
														
														 | 
														
															                 <el-date-picker 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                  v-model="queryParams.secondDate" 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                  v-model="searchParams.secondDate" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                   type="datetimerange" 
														 | 
														
														 | 
														
															                   type="datetimerange" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                   value-format="yyyy-MM-dd HH:mm:ss" 
														 | 
														
														 | 
														
															                   value-format="yyyy-MM-dd HH:mm:ss" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                   size="mini" 
														 | 
														
														 | 
														
															                   size="mini" 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -350,7 +350,7 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 v-model.number="queryParams.secondStartLiters" 
														 | 
														
														 | 
														
															                 v-model.number="queryParams.secondStartLiters" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               /> 
														 | 
														
														 | 
														
															               /> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               <div class="input-group-prepend"> 
														 | 
														
														 | 
														
															               <div class="input-group-prepend"> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                <span class="input-group-text" id="addon-wrapping">元</span> 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                <span class="input-group-text" id="addon-wrapping">升</span> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               </div> 
														 | 
														
														 | 
														
															               </div> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               <div class="input-group-prepend"> 
														 | 
														
														 | 
														
															               <div class="input-group-prepend"> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 <span class="input-group-text" id="addon-wrapping" 
														 | 
														
														 | 
														
															                 <span class="input-group-text" id="addon-wrapping" 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -365,7 +365,7 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 v-model.number="queryParams.secondEndLiters" 
														 | 
														
														 | 
														
															                 v-model.number="queryParams.secondEndLiters" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               /> 
														 | 
														
														 | 
														
															               /> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               <div class="input-group-prepend"> 
														 | 
														
														 | 
														
															               <div class="input-group-prepend"> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                <span class="input-group-text" id="addon-wrapping">元</span> 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                <span class="input-group-text" id="addon-wrapping">升</span> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               </div> 
														 | 
														
														 | 
														
															               </div> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             </div> 
														 | 
														
														 | 
														
															             </div> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           </div> 
														 | 
														
														 | 
														
															           </div> 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -624,6 +624,10 @@ export default { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       total: 0, 
														 | 
														
														 | 
														
															       total: 0, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       // 客户电子会员卡充值消费记录表格数据 
														 | 
														
														 | 
														
															       // 客户电子会员卡充值消费记录表格数据 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       userList: [], 
														 | 
														
														 | 
														
															       userList: [], 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      searchParams:{ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        data: null, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        secondDate: null, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      }, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       // 查询参数 
														 | 
														
														 | 
														
															       // 查询参数 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       queryParams: { 
														 | 
														
														 | 
														
															       queryParams: { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         pageNum: 1, 
														 | 
														
														 | 
														
															         pageNum: 1, 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -631,7 +635,7 @@ export default { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															         oilName: null, 
														 | 
														
														 | 
														
															         oilName: null, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         labelId: null, 
														 | 
														
														 | 
														
															         labelId: null, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        data: null, 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         beginDate: null, 
														 | 
														
														 | 
														
															         beginDate: null, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         endDate: null, 
														 | 
														
														 | 
														
															         endDate: null, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -647,7 +651,6 @@ export default { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         endLiters: null, 
														 | 
														
														 | 
														
															         endLiters: null, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															         secondFlag: 0, 
														 | 
														
														 | 
														
															         secondFlag: 0, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        secondDate: null, 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         secondBeginDate: null, 
														 | 
														
														 | 
														
															         secondBeginDate: null, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         secondEndDate: null, 
														 | 
														
														 | 
														
															         secondEndDate: null, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -869,19 +872,19 @@ export default { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     }, 
														 | 
														
														 | 
														
															     }, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     /** 查询客户电子会员卡充值消费记录列表 */ 
														 | 
														
														 | 
														
															     /** 查询客户电子会员卡充值消费记录列表 */ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     getList() { 
														 | 
														
														 | 
														
															     getList() { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-      if (this.queryParams.data === null) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      if (this.searchParams.data === null) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         this.queryParams.beginDate = null; 
														 | 
														
														 | 
														
															         this.queryParams.beginDate = null; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         this.queryParams.endDate = null; 
														 | 
														
														 | 
														
															         this.queryParams.endDate = null; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       } else { 
														 | 
														
														 | 
														
															       } else { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        this.queryParams.beginDate = this.queryParams.data[0]; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        this.queryParams.endDate = this.queryParams.data[1]; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        this.queryParams.beginDate = this.searchParams.data[0]; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        this.queryParams.endDate = this.searchParams.data[1]; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       } 
														 | 
														
														 | 
														
															       } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-      if (this.queryParams.secondDate === null) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+      if (this.searchParams.secondDate === null) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         this.queryParams.secondBeginDate = null; 
														 | 
														
														 | 
														
															         this.queryParams.secondBeginDate = null; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         this.queryParams.secondEndDate = null; 
														 | 
														
														 | 
														
															         this.queryParams.secondEndDate = null; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       } else { 
														 | 
														
														 | 
														
															       } else { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        this.queryParams.secondBeginDate = this.queryParams.secondDate[0]; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        this.queryParams.secondEndDate = this.queryParams.secondDate[1]; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        this.queryParams.secondBeginDate = this.searchParams.secondDate[0]; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        this.queryParams.secondEndDate = this.searchParams.secondDate[1]; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       } 
														 | 
														
														 | 
														
															       } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       console.log(this.queryParams); 
														 | 
														
														 | 
														
															       console.log(this.queryParams); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       getLabelUser(this.queryParams).then((response) => { 
														 | 
														
														 | 
														
															       getLabelUser(this.queryParams).then((response) => { 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -950,4 +953,4 @@ export default { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 .el-icon-arrow-down { 
														 | 
														
														 | 
														
															 .el-icon-arrow-down { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															   font-size: 12px; 
														 | 
														
														 | 
														
															   font-size: 12px; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 } 
														 | 
														
														 | 
														
															 } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-</style> 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+</style> 
														 |