diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
index 3315e1cef..3f4dedae2 100644
--- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
@@ -52,7 +52,9 @@
{{
item.bankCode
}}
- {{item.provCode}}/ {{item.areaCode}}
+ {{provCode(item.provCode)}}/ {{areaCode(item.areaCode)}}
+
+
@@ -316,8 +318,16 @@ export default {
};
},
methods: {
+ areaCode(area){
+ let arr = this.options.find(item => item.cities[0].value == area)
+ return arr.title
+
+ },
+ provCode(code){
+ let arr = this.options.find(item => item.value == code)
+ return arr.title
+ },
handleChange(value) {
- console.log(value);
this.ruleForm.provCode = value[0]
this.ruleForm.areaCode = value[1]
},
diff --git a/jsowell-ui/src/views/pile/merchant/components/revenue.vue b/jsowell-ui/src/views/pile/merchant/components/revenue.vue
index 01812501d..3f16c0372 100644
--- a/jsowell-ui/src/views/pile/merchant/components/revenue.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/revenue.vue
@@ -96,13 +96,13 @@
/>
-
+ />
@@ -115,52 +115,47 @@ export default {
value: "",
reportList: [],
merchantOrderReport: {},
+ total:0,
queryParams: {
pageNum: 1,
pageSize: 10,
- merchantId: null,
- stationId: null,
- stationName: null,
- useElectricity: null,
- chargeNum: null,
- chargeTime: null,
- electricityAmount: null,
- serviceAmount: null,
- totalAmount: null,
- virtualAmount: null,
- tradeDate: null,
- tradeAmount: null,
- tradeFee: null,
+ merchantId: this.merchantId,
+ startTime:'',
+ endTime:''
},
};
},
methods: {
getList() {
- const params = {
- merchantId: this.merchantId,
- startTime: "",
- endTime: "",
- };
- getMerchantOrderReport(params).then(
+ console.log('queryParams',this.queryParams)
+ getMerchantOrderReport(this.queryParams).then(
(response) => {
// console.log("查询报表", reportList, merchantOrderReport);
- console.log('response',response)
- this.reportList = response.data.reportList;
+ // console.log('getMerchantOrderReport',response)
+ this.reportList = response.data.pageResponse.list;
this.merchantOrderReport = response.data.merchantOrderReport;
- console.log("查询报表", this.merchantOrderReport, this.reportList);
+ // console.log("查询报表", this.merchantOrderReport, this.reportList);
+ this.total = response.data.pageResponse.total
}
);
},
handleQuery() {
console.log("this.value 日期", this.value);
+ let arr = this.value[0].split(' ')[0]
+ let str = this.value[1].split(' ')[0]
+ console.log('arr,str',arr,str)
+ this.queryParams.startTime = arr
+ this.queryParams.endTime = str
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
- this.value = null;
+ this.value = ''
+ this.queryParams.startTime = ''
+ this.queryParams.endTime =''
this.resetForm("queryForm");
- this.handleQuery();
+ this.getList();
},
handleSelectionChange(selection) {
console.log("selection", selection);