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: '请选择油站账户' }}
-
+
+
+
+ 账户余额
+ {{postData.balance?postData.balance:''}}
+
+
+ 待审核充值金额
+ {{postData.theRemainingAmount?postData.theRemainingAmount:''}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{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)'
}