From 7c2554cde18de7c2d99937e0fed829f957929f42 Mon Sep 17 00:00:00 2001 From: zhangyouji Date: Tue, 12 Dec 2023 16:54:00 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81oms=E8=B0=83=E6=8B=A8=E6=97=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=AF=E8=B0=83=E6=8B=A8=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=8F=8A=E5=93=AA=E4=BA=9B=E8=B4=A6=E6=88=B7=E5=8F=AF=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E8=B0=83=E6=8B=A8=202=E3=80=81oms=E5=8F=AF=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E8=BF=94=E5=88=A9=E5=85=85=E5=80=BC=E3=80=82=203?= =?UTF-8?q?=E3=80=81oms=E6=B2=B9=E7=AB=99=E8=B4=A6=E6=88=B7=E5=8F=AF?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=BF=913=E6=97=A5=E5=B9=B3=E5=9D=87?= =?UTF-8?q?=E9=94=80=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- financialCenter/serviceStation/index.vue | 7 +- oilAccount/components/accountListItem.vue | 4 +- oilAccount/page/accountRecharge/add.vue | 148 ++++++++++++++++---- oilAccount/page/accountRecharge/details.vue | 4 +- 4 files changed, 128 insertions(+), 35 deletions(-) diff --git a/financialCenter/serviceStation/index.vue b/financialCenter/serviceStation/index.vue index 4485248..347b7d3 100644 --- a/financialCenter/serviceStation/index.vue +++ b/financialCenter/serviceStation/index.vue @@ -23,6 +23,8 @@ {{item.accountName}} 账户总余额：{{handlerNumber(item.balance)}} + 近3日平均销量：{{handlerNumber(item.nlyThreedaysAvgAmount)}} + 统计时间：{{item.nlyThreedaysAvgTime?item.nlyThreedaysAvgTime:'--'}} @@ -128,7 +130,7 @@ position: relative; margin-bottom: 25rpx; padding-top: 60rpx; - height: 200rpx; + height: 300rpx; width: 100%; background: #fff; border-radius: 10rpx; @@ -155,9 +157,10 @@ font-weight: 550; } - .container .item view:nth-of-type(2) { + .container .item view { margin-top: 10rpx; color: #778899; font-size: 24rpx; } + diff --git a/oilAccount/components/accountListItem.vue b/oilAccount/components/accountListItem.vue index ddf14ae..2c376ce 100644 --- a/oilAccount/components/accountListItem.vue +++ b/oilAccount/components/accountListItem.vue @@ -92,13 +92,13 @@ } case 'RECHARGE_REBETE': return { - text: '折返', + text: '充返', color: '#9F43CC', bg: 'rgba(159, 67, 204, 0.1)' } case 'CONSUME_REBATE': return { - text: '折返', + text: '消返', color: '#9F43CC', bg: 'rgba(159, 67, 204, 0.1)' } diff --git a/oilAccount/page/accountRecharge/add.vue b/oilAccount/page/accountRecharge/add.vue index 52b127f..4fefda8 100644 --- a/oilAccount/page/accountRecharge/add.vue +++ b/oilAccount/page/accountRecharge/add.vue @@ -2,9 +2,10 @@ - + 调拨 回拨 + 充返 @@ -19,7 +20,7 @@ {{ postData.accountName?postData.accountName: '请选择油站账户' }} - + @@ -29,6 +30,16 @@ {{postData.companyName?postData.companyName:'选择账户后自动带出'}} + + + 账户余额 + {{postData.balance?postData.balance:''}} + + + 待审核充值金额 + {{postData.theRemainingAmount?postData.theRemainingAmount:''}} + + @@ -40,12 +51,46 @@ placeholder="请输入交易金额" class="list_right_input" /> + + + + + 交易摘要 + + + + + + + + + + + 返利时间段 + + + + {{postData.rebateStartTime?postData.rebateStartTime+','+postData.rebateEndTime:'请选择返利时间段'}} + + + + + + 线下交易凭证 + + {{postData.offlineTransactionProof?'已上传':'请上传'}} + + - + @@ -60,6 +105,7 @@ import account from '@/api/oilAccount' import md5 from 'js-md5' import cpicker from '../../components/picker.vue' + import utils from '@/utils/encode' export default { components: { cpicker @@ -78,6 +124,8 @@ oilCompanyBank: false }, disabled: false, + rebateTimeSlot:[], + imageValue:[], postData: { accountName:'', companyName:'', @@ -89,7 +137,10 @@ transactionType: "", //交易类型 createSource: "OMS-MINIAPP", balance:'', - totalRechargeAmount:'' + totalRechargeAmount:'', + rebateStartTime:'', + rebateEndTime:'', + offlineTransactionProof:'' } } }, @@ -109,6 +160,16 @@ }, seleBarFn(e) { this.barIndex = e + if(this.barIndex!=3){ + this.postData.reverseRemark = '' + this.postData.rebateStartTime = '' + this.postData.rebateEndTime = '' + this.postData.offlineTransactionProof = '' + } + }, + pickerClick(time) { + this.postData.rebateStartTime = time[0] + this.postData.rebateEndTime = time[1] }, isShowFn(e) { this.isShow[e] = !this.isShow[e] @@ -142,14 +203,14 @@ }, //图片上传方法 clickfn(e) { - // if (typeof e !== "object") { - // this.postData.offlineTransactionProof = e; - // uni.showToast({ - // title: '上传成功' - // }) - // return - // } - // tool.chooseImage(this.clickfn) + if (typeof e !== "object") { + this.postData.offlineTransactionProof = e; + uni.showToast({ + title: '上传成功' + }) + return + } + tool.chooseImage(this.clickfn) }, companyAccountConfirm(e) { this.clearFn(this.postData,['accountName','siteChannelAccountId','receivingCompanyId','companyName','theRemainingAmount','totalRechargeAmount']) @@ -164,6 +225,7 @@ account.getLikeBySiteComNameLimitNew({id:a[0].siteCompanyInfoId}).then(res=>{ this.postData.companyName = res.data[0]['companyName']; this.postData.balance = res.data[0]['balance'] + this.postData.theRemainingAmount = res.data[0]['theRemainingAmount'] }) }else{ uni.showToast({ @@ -223,19 +285,41 @@ let that = this let olicheck = null let check = null - let checkPage = { - receivingCompanyId: { - tacitly: '', - WrongText: '请完善油站公司信息' - }, - siteChannelAccountId: { - tacitly: '', - WrongText: '请完善油站账户信息' - }, - transactionAmount: { - tacitly: '', - WrongText: '交易金额不能为空' - }, + let checkPage = {} + if(this.barIndex==3){ + checkPage = { + siteChannelAccountId: { + tacitly: '', + WrongText: '请完善油站账户信息' + }, + transactionAmount: { + tacitly: '', + WrongText: '交易金额不能为空' + }, + reverseRemark: { + tacitly: '', + WrongText: '交易摘要不能为空' + }, + rebateStartTime: { + tacitly: '', + WrongText: '返利时间不能为空' + }, + } + }else{ + checkPage = { + receivingCompanyId: { + tacitly: '', + WrongText: '请完善油站公司信息' + }, + siteChannelAccountId: { + tacitly: '', + WrongText: '请完善油站账户信息' + }, + transactionAmount: { + tacitly: '', + WrongText: '交易金额不能为空' + }, + } } check = tool.checkFn(this.postData, [], checkPage) if (!check.result) { @@ -247,7 +331,9 @@ } - if(this.barIndex==1){ + if(this.barIndex==3){ + this.saveFn() + }else if(this.barIndex==1){ if(Number(this.postData.transactionAmount)>Number(this.postData.balance)){ uni.showModal({ title: '提示', @@ -282,7 +368,7 @@ } }, saveFn() { - this.postData['transactionType'] = this.barIndex==1?'DISPATCH':'CALLBACK' + this.postData['transactionType'] = this.barIndex==1?'DISPATCH': this.barIndex==3?'RECHARGE_REBETE':'CALLBACK' account.saveNew(this.postData).then(res => { (res.code == 20000) && uni.showToast({ title: '操作成功', @@ -309,7 +395,7 @@ .move_item { position: absolute; left: 10rpx; - width: 50%; + width: 33%; height: 60rpx; background: #2866FF; border-radius: 10rpx; @@ -479,6 +565,10 @@ box-sizing: border-box; padding-left: 20rpx; } + .flex_jw{ + display: flex; + justify-content:space-between; + } .addDiver_body { padding: 0 40rpx; diff --git a/oilAccount/page/accountRecharge/details.vue b/oilAccount/page/accountRecharge/details.vue index 881dfae..80df906 100644 --- a/oilAccount/page/accountRecharge/details.vue +++ b/oilAccount/page/accountRecharge/details.vue @@ -191,13 +191,13 @@ } case 'RECHARGE_REBETE': return { - text: '折返', + text: '充返', color: '#9F43CC', bg: 'rgba(159, 67, 204, 0.1)' } case 'CONSUME_REBATE': return { - text: '折返', + text: '消返', color: '#9F43CC', bg: 'rgba(159, 67, 204, 0.1)' }