Commit 35bc1f6e by liang ce

修改zbug

parent 3e004a7c
...@@ -10,7 +10,7 @@ const config = { ...@@ -10,7 +10,7 @@ const config = {
url: MINGPAY_CONSTANT.MINGPAY_CONSTANT_URL, url: MINGPAY_CONSTANT.MINGPAY_CONSTANT_URL,
agentId: MINGPAY_CONSTANT.MINGPAY_CONSTANT_AGENTID agentId: MINGPAY_CONSTANT.MINGPAY_CONSTANT_AGENTID
}) })
return axios.post(`http://192.168.1.193:8300/v1/auth/getJsAuthenticationParameter?${senddate}`).then((res) => { return axios.post(`http://139.196.213.18:8300/v1/auth/getJsAuthenticationParameter?${senddate}`).then((res) => {
let agentId = res.data.data.agentId let agentId = res.data.data.agentId
let timeStamp = res.data.data.timeStamp let timeStamp = res.data.data.timeStamp
let nonceStr = res.data.data.nonceStr let nonceStr = res.data.data.nonceStr
...@@ -56,7 +56,7 @@ const config = { ...@@ -56,7 +56,7 @@ const config = {
code: info.code, code: info.code,
corpId: 'ding9a93ca550f036ffe35c2f4657eb6378f' corpId: 'ding9a93ca550f036ffe35c2f4657eb6378f'
}) })
return axios.post(`http://192.168.1.193:8300/v1/auth/token?${senddate}`).then((res) => { return axios.post(`http://139.196.213.18:8300/v1/auth/token?${senddate}`).then((res) => {
console.log(res) console.log(res)
if (res.data.resultCode === '0') { if (res.data.resultCode === '0') {
sessionStorage.setItem('token', res.data.data.accessToken.access_token) sessionStorage.setItem('token', res.data.data.accessToken.access_token)
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<div class="searchBox"> <div class="searchBox">
<a-input placeholder="选择成员" @click="choosePeople" style="width: 120px"/> <a-input placeholder="选择成员" @click="choosePeople" style="width: 120px"/>
<a-input placeholder="输入卡号" v-model="searchSource.cardNum" style="width: 120px"/> <a-input placeholder="输入卡号" v-model="searchSource.cardNum" style="width: 120px"/>
<a-select defaultValue="卡片状态" style="width: 120px;margin-right: 20px;" notFoundContent="asdasd" :allowClear="true" @change="selectHandleChangeCard"> <a-select placeholder="卡片状态" style="width: 120px;margin-right: 20px;" :allowClear="true" @change="selectHandleChangeCard">
<a-select-option value="ACTIVE">已绑卡</a-select-option> <a-select-option value="ACTIVE">已绑卡</a-select-option>
<a-select-option value="NOT_EXIST">未绑卡</a-select-option> <a-select-option value="NOT_EXIST">未绑卡</a-select-option>
<a-select-option value="UNACTIVE">已冻结</a-select-option> <a-select-option value="UNACTIVE">已冻结</a-select-option>
</a-select> </a-select>
<a-select defaultValue="账户状态" style="width: 120px;margin-right: 20px;" :allowClear="true" @change="selectHandleChangeAccount"> <a-select placeholder="账户状态" style="width: 120px;margin-right: 20px;" :allowClear="true" @change="selectHandleChangeAccount">
<a-select-option value="ACTIVE">使用中</a-select-option> <a-select-option value="ACTIVE">使用中</a-select-option>
<a-select-option value="LOG_OFF">已冻结并结现</a-select-option> <a-select-option value="LOG_OFF">已冻结并结现</a-select-option>
</a-select> </a-select>
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
{{ departmentNameListToStr(departmentNameList) }} {{ departmentNameListToStr(departmentNameList) }}
</span> </span>
<span slot="realityBalance">余额</span> <span slot="realityBalance">余额</span>
<span slot="cardNo" slot-scope="cardNo, record"> <span slot="cardNo" slot-scope="cardNo">
{{ cardNo ? cardNo : '未绑卡' }} {{ cardNo ? cardNo : '未绑卡' }}
<br/> </span>
{{ cardNo ? record.cardStatus === 'UNACTIVE' ? '已冻结' : '使用中' : ''}} <span slot="cardStatus" slot-scope="cardStatus, record">
{{ record.cardNo ? cardStatus === 'UNACTIVE' ? '已冻结' : '使用中' : ''}}
</span> </span>
<span slot="status" slot-scope="status"> <span slot="status" slot-scope="status">
<!-- {{ status === MINGPAY_ACCOUNT_STATUS.ACTIVE ? '使用中' : '已注销并结现' }} --> <!-- {{ status === MINGPAY_ACCOUNT_STATUS.ACTIVE ? '使用中' : '已注销并结现' }} -->
...@@ -123,10 +124,14 @@ export default { ...@@ -123,10 +124,14 @@ export default {
title: '余额', title: '余额',
dataIndex: 'realityBalance' dataIndex: 'realityBalance'
}, { }, {
title: '实体卡状态', title: '实体卡卡号',
dataIndex: 'cardNo', dataIndex: 'cardNo',
scopedSlots: { customRender: 'cardNo' } scopedSlots: { customRender: 'cardNo' }
}, { }, {
title: '实体卡状态',
dataIndex: 'cardStatus',
scopedSlots: { customRender: 'cardStatus' }
}, {
title: '账户状态', title: '账户状态',
dataIndex: 'status', dataIndex: 'status',
scopedSlots: { customRender: 'status' } scopedSlots: { customRender: 'status' }
...@@ -330,7 +335,7 @@ export default { ...@@ -330,7 +335,7 @@ export default {
$http.get(`/v1/account/${url}?${accountOperationData}`).then((res) => { $http.get(`/v1/account/${url}?${accountOperationData}`).then((res) => {
if (res.data.message === 'SUCCESS') { if (res.data.message === 'SUCCESS') {
this.queryAccountList() this.queryAccountList()
this.$message.success('操作成功') this.$message.success('充值已提交,审批中请耐心等待')
} }
}).catch(() => { }).catch(() => {
this.$message.error('修改失败') this.$message.error('修改失败')
......
<template> <template>
<div class="AllowancePayment"> <div class="AllowancePayment">
<div class="searchBox"> <div class="searchBox">
<a-select defaultValue="津贴类型" style="width: 120px;margin-right: 20px;" @change="selectHandType"> <a-select placeholder="津贴类型" :allowClear="true" style="width: 120px;margin-right: 20px;" @change="selectHandType">
<a-select-option value="travel">交通补助</a-select-option> <a-select-option value="travel">交通补助</a-select-option>
<a-select-option value="meal">餐补</a-select-option> <a-select-option value="meal">餐补</a-select-option>
</a-select> </a-select>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="searchBox"> <div class="searchBox">
<a-input placeholder="选择成员" @click="choosePeople"/> <a-input placeholder="选择成员" @click="choosePeople"/>
<!-- <a-input placeholder="经办人"/> --> <!-- <a-input placeholder="经办人"/> -->
<a-select defaultValue="状态" style="width: 120px;margin-right: 20px;" @change="selectHandlestatus"> <a-select placeholder="状态" :allowClear="true" style="width: 120px;margin-right: 20px;" @change="selectHandlestatus">
<!-- <a-select-option value="WAITING_PAYMENT">等待支付</a-select-option> --> <!-- <a-select-option value="WAITING_PAYMENT">等待支付</a-select-option> -->
<a-select-option value="SUCCESS">已完成</a-select-option> <a-select-option value="SUCCESS">已完成</a-select-option>
<a-select-option value="WAITING_PERMIT">审批中</a-select-option> <a-select-option value="WAITING_PERMIT">审批中</a-select-option>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="RecordsOfConsumption"> <div class="RecordsOfConsumption">
<div class="searchBox"> <div class="searchBox">
<a-input placeholder="消费人" @click="choosePeople" style="width: 120px"/> <a-input placeholder="消费人" @click="choosePeople" style="width: 120px"/>
<a-select defaultValue="状态" style="width: 120px;margin-right: 20px;" @change="selectHandRecords"> <a-select placeholder="状态" :allowClear="true" style="width: 120px;margin-right: 20px;" @change="selectHandRecords">
<a-select-option value="SUCCESS">已消费</a-select-option> <a-select-option value="SUCCESS">已消费</a-select-option>
<a-select-option value="WAITING_PERMIT">退款审核中</a-select-option> <a-select-option value="WAITING_PERMIT">退款审核中</a-select-option>
<a-select-option value="REFUND_SUCCESS">已退款</a-select-option> <a-select-option value="REFUND_SUCCESS">已退款</a-select-option>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment