|
@@ -120,7 +120,7 @@
|
|
|
</span>
|
|
</span>
|
|
|
<span style="display: block; margin-left: 10px;">
|
|
<span style="display: block; margin-left: 10px;">
|
|
|
<a-tag color="orange">
|
|
<a-tag color="orange">
|
|
|
- <pre style="margin: 0;">消费:¥300 收款:¥0 余额:¥-300</pre>
|
|
|
|
|
|
|
+ <pre style="margin: 0;">消费:¥{{ accountModel.consume }} 收款:¥{{ accountModel.payment }} 余额:¥{{ accountModel.consume - accountModel.payment }}</pre>
|
|
|
</a-tag>
|
|
</a-tag>
|
|
|
</span>
|
|
</span>
|
|
|
</div>
|
|
</div>
|
|
@@ -372,9 +372,19 @@ export default {
|
|
|
// if (!this.queryParam.endTime=="") {
|
|
// if (!this.queryParam.endTime=="") {
|
|
|
// this.url.list = this.url.list + "&endDate=" + this.queryParam.endTime
|
|
// this.url.list = this.url.list + "&endDate=" + this.queryParam.endTime
|
|
|
// }
|
|
// }
|
|
|
|
|
+ this.getAccount();
|
|
|
this.loadData(1);
|
|
this.loadData(1);
|
|
|
this.selectedRowKeys = [];
|
|
this.selectedRowKeys = [];
|
|
|
this.selectionRows = [];
|
|
this.selectionRows = [];
|
|
|
|
|
+
|
|
|
|
|
+ },
|
|
|
|
|
+ searchQuery() {
|
|
|
|
|
+ this.getAccount();
|
|
|
|
|
+ this.loadData(1);
|
|
|
|
|
+ // 点击查询清空列表选中行
|
|
|
|
|
+ // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
|
|
|
|
|
+ this.selectedRowKeys = []
|
|
|
|
|
+ this.selectionRows = []
|
|
|
},
|
|
},
|
|
|
onTypeChange(e) {
|
|
onTypeChange(e) {
|
|
|
if (this.settleType == 1 || this.settleType == 2){
|
|
if (this.settleType == 1 || this.settleType == 2){
|
|
@@ -388,6 +398,7 @@ export default {
|
|
|
// if (!this.queryParam.endTime=="") {
|
|
// if (!this.queryParam.endTime=="") {
|
|
|
// this.url.list = this.url.list + "&endDate=" + this.queryParam.endTime
|
|
// this.url.list = this.url.list + "&endDate=" + this.queryParam.endTime
|
|
|
// }
|
|
// }
|
|
|
|
|
+ this.getAccount();
|
|
|
this.loadData(1);
|
|
this.loadData(1);
|
|
|
this.selectedRowKeys = [];
|
|
this.selectedRowKeys = [];
|
|
|
this.selectionRows = [];
|
|
this.selectionRows = [];
|
|
@@ -492,9 +503,12 @@ export default {
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
getAccount(){
|
|
getAccount(){
|
|
|
|
|
+ console.log(this.queryParam)
|
|
|
var that = this;
|
|
var that = this;
|
|
|
getAction(this.url.queryAgreementAccount, {
|
|
getAction(this.url.queryAgreementAccount, {
|
|
|
agreementUnitId: this.agreementUnitInfo.id,
|
|
agreementUnitId: this.agreementUnitInfo.id,
|
|
|
|
|
+ startTime: this.queryParam.startTime,
|
|
|
|
|
+ endTime: this.queryParam.endTime,
|
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
|
console.log(res)
|
|
console.log(res)
|
|
|
if (res.success) {
|
|
if (res.success) {
|