From fc9fd3d867a4c5be9d29936247501511bf12f04b Mon Sep 17 00:00:00 2001 From: "BOOL\\25024" Date: Mon, 30 Oct 2023 09:32:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=88=86=E6=9E=90=E6=8F=90=E7=8E=B0=E6=97=B6=E9=97=B4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/financial/financeDetail.vue | 280 ++++++------------ jsowell-ui/src/views/pile/station/detail.vue | 2 +- 2 files changed, 89 insertions(+), 193 deletions(-) diff --git a/jsowell-ui/src/views/financial/financeDetail.vue b/jsowell-ui/src/views/financial/financeDetail.vue index 7429dfe80..d8263008a 100644 --- a/jsowell-ui/src/views/financial/financeDetail.vue +++ b/jsowell-ui/src/views/financial/financeDetail.vue @@ -1,6 +1,6 @@ @@ -428,10 +300,8 @@ export default { if (code == null) { return ""; } - // if (code === undefined) return; const bankList = text.bankList; let arr = bankList.find((item) => item.bankCode === code); - // console.log("银行编码对应的银行名称 arr", arr); if (arr.bankName != null) { this.bankName = arr.bankName; } @@ -484,7 +354,6 @@ export default { this.orderList = res.rows; this.orderTotal = res.total; this.orderLoading = false; - // console.log("this.orderTotal", this.orderTotal); }); }, // 弹层关闭之前执行的事情 @@ -508,7 +377,6 @@ export default { getList() { console.log("queryParams", this.queryParams); getMerchantOrderReport(this.reportQueryParams).then((response) => { - // console.log("查询报表", reportList, merchantOrderReport); console.log("getMerchantOrderReport", response); if (response.data) { this.merchantOrderReport = response.data.merchantOrderReport; @@ -540,7 +408,7 @@ export default { }); this.dialogVisible = false; }) - .catch((_) => {}); + .catch((_) => { }); }, // 点击提交按钮 submit() { @@ -581,6 +449,9 @@ export default { this.reportQueryParams.endTime = end; this.getList(); }, + already() { + this.recordDialog = true + } }, created() { this.defaultDate(); @@ -594,58 +465,83 @@ export default { .color60 { color: #606266; } + .center { display: flex; align-content: center; margin-top: 30px; } + .margin-20 { margin: 20px 0; font-size: 20px; } + .font-13 { font-size: 13px; } + .header { + display: flex; + align-items: center; +} + +.header-cont { display: flex; justify-content: space-between; align-items: center; } + .header-txt { font-size: 24px; } + .text { font-size: 12px; color: red; } + .foot1 { - width: 25%; + width: 20%; margin-top: 10px; - // .el-descriptions__body .el-descriptions__table { - // width: 0 !important; - // } + + ::v-deep .el-descriptions-item__label { + width: 80px; + margin-right: 0; + } } + .foot2 { margin-left: 10px; margin-right: 10px; - width: 200px; + width: 450px; + + ::v-deep .el-descriptions-item__label { + width: 105px; + margin-right: 0; + } } + .foot3 { - width: 200px; + width: 400px; margin-right: 10px; + + ::v-deep .el-descriptions-item__label { + width: 108px; + margin-right: 0; + } } + .foot4 { display: inline-block; - // flex: 1; - // display: flex; - // justify-content: space-between; - // margin-left: 50px; } + .margin-right { - width: 180px; - margin-right: 10px; + width: 500px; + // margin-right: 50px; text-align: center; } + .color { color: #000; font-weight: bolder; diff --git a/jsowell-ui/src/views/pile/station/detail.vue b/jsowell-ui/src/views/pile/station/detail.vue index 4692b42b9..1d968205a 100644 --- a/jsowell-ui/src/views/pile/station/detail.vue +++ b/jsowell-ui/src/views/pile/station/detail.vue @@ -438,7 +438,7 @@ export default { }, queryStationInfo() { console.log("stationId", this.stationId); - getStationInfo(this.stationId).then((res) => { + getStationInfo(this.statio2nId).then((res) => { // console.log(res); this.stationDetail = res.data; this.stationLat = res.data.stationLat; From e7bc7fa292a62a1a751034ab65dcf29fd4130326 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 31 Oct 2023 11:47:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?update=20=E6=98=BE=E7=A4=BA=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E5=8D=95=E5=8F=B7=E5=92=8C=E6=8F=90=E7=8E=B0=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/pile/vo/web/MerchantClearingBillVO.java | 3 +++ .../main/resources/mapper/pile/ClearingBillInfoMapper.xml | 4 +++- jsowell-ui/src/views/financial/financeDetail.vue | 8 ++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantClearingBillVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantClearingBillVO.java index 759be6d48..f20eedf3b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantClearingBillVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantClearingBillVO.java @@ -46,4 +46,7 @@ public class MerchantClearingBillVO { // 提现单号 private String withdrawCode; + + // 提现申请时间 + private String applicationTime; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml index 2ff38f6b2..db04e8aa1 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml @@ -774,9 +774,11 @@ t1.actual_clearing_amount as actualClearingAmount, t1.fee_amount as feeAmount, t1.withdrawable_amount as withdrawAbleAmount, - t1.withdraw_code as withdrawCode + t1.withdraw_code as withdrawCode, + t3.application_time as applicationTime from clearing_bill_info t1 join pile_merchant_info t2 on t1.merchant_id = t2.id and t1.del_flag = '0' + join clearing_withdraw_info t3 on t3.withdraw_code = t1.withdraw_code and t3.del_flag = '0' where t1.merchant_id = #{merchantId,jdbcType=VARCHAR} and t1.trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR} order by diff --git a/jsowell-ui/src/views/financial/financeDetail.vue b/jsowell-ui/src/views/financial/financeDetail.vue index 7429dfe80..c05636bd8 100644 --- a/jsowell-ui/src/views/financial/financeDetail.vue +++ b/jsowell-ui/src/views/financial/financeDetail.vue @@ -260,12 +260,8 @@ align="center" prop="clearingBillCode" /> --> - - + +