Commit 3e004a7c by liang ce

bug修改,账户列表模块问题

parent 77c28af9
...@@ -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://139.196.213.18:8300/v1/auth/getJsAuthenticationParameter?${senddate}`).then((res) => { return axios.post(`http://192.168.1.193: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://139.196.213.18:8300/v1/auth/token?${senddate}`).then((res) => { return axios.post(`http://192.168.1.193: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,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<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;" @change="selectHandleChangeCard"> <a-select defaultValue="卡片状态" style="width: 120px;margin-right: 20px;" notFoundContent="asdasd" :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;" @change="selectHandleChangeAccount"> <a-select defaultValue="账户状态" 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>
<a-button type="primary" @click="queryAccountList()">查询</a-button> <a-button type="primary" @click="queryAccountList()">查询</a-button>
</div> </div>
...@@ -33,18 +33,20 @@ ...@@ -33,18 +33,20 @@
{{ cardNo ? record.cardStatus === 'UNACTIVE' ? '已冻结' : '使用中' : ''}} {{ cardNo ? record.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 ? '使用中' : '已注销并结现' }} {{ status === MINGPAY_ACCOUNT_STATUS.ACTIVE ? '使用中' : '已注销并结现' }}
</span> </span>
<span slot="action" slot-scope="text, record, index" class="operationTable"> <span slot="action" slot-scope="text, record, index" class="operationTable">
<a href="javascript:;" @click="ToViewAllowances(record)">查看津贴</a> <a href="javascript:;" @click="ToViewAllowances(record)">查看津贴</a>
<a v-if="record.status = MINGPAY_ACCOUNT_STATUS.ACTIVE" href="javascript:;" @click="showModal(record.userId, record.name, index)">充值</a> <a v-if="record.status === MINGPAY_ACCOUNT_STATUS.ACTIVE" href="javascript:;" @click="showModal(record.userId, record.name, index)">充值</a>
<a-dropdown v-if="record.status = MINGPAY_ACCOUNT_STATUS.ACTIVE"> <a-dropdown v-if="record.status === MINGPAY_ACCOUNT_STATUS.ACTIVE">
<a class="ant-dropdown-link" href="javascript:;"> <a class="ant-dropdown-link" href="javascript:;">
更多操作 <a-icon type="down" /> 更多操作 <a-icon type="down" />
</a> </a>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item v-if="record.cardStatus === MINGPAY_ACCOUNT_STATUS.ACTIVE && record.cardNo "> <a-menu-item v-if="record.cardStatus === MINGPAY_ACCOUNT_STATUS.ACTIVE && record.cardNo ">
<a href="javascript:;" @click="showConfirm(record.userId, 1, index)">冻结实体卡</a> <a href="javascript:;" @click="showConfirm(record.userId, 1, index)">冻结实体卡</a>
{{ record.cardNo }}
</a-menu-item> </a-menu-item>
<a-menu-item v-if="record.cardStatus === MINGPAY_ACCOUNT_STATUS.UNACTIVE && record.cardNo"> <a-menu-item v-if="record.cardStatus === MINGPAY_ACCOUNT_STATUS.UNACTIVE && record.cardNo">
<a href="javascript:;" @click="showConfirm(record.userId, 2, index)">解冻实体卡</a> <a href="javascript:;" @click="showConfirm(record.userId, 2, index)">解冻实体卡</a>
...@@ -81,9 +83,6 @@ ...@@ -81,9 +83,6 @@
</a-form-item> </a-form-item>
</a-form> </a-form>
</a-modal> </a-modal>
<!-- 账户管理 -->
<!-- <button @click="asd()">鉴权</button> -->
<!-- <button @click="asd2()"> 免等</button> -->
</div> </div>
</template> </template>
...@@ -183,8 +182,8 @@ export default { ...@@ -183,8 +182,8 @@ export default {
$http.get(`/v1/account/queryAccountList?${AccountData}`).then((res) => { $http.get(`/v1/account/queryAccountList?${AccountData}`).then((res) => {
_that.accountList = res.data.data.recordList _that.accountList = res.data.data.recordList
_that.pagination.total = parseInt(res.data.data.totalCount) _that.pagination.total = parseInt(res.data.data.totalCount)
console.log(_that) }).catch((err) => {
console.log(_that.accountList) console.log(err)
}) })
}, },
// 搜索条件,卡片和账户状态 // 搜索条件,卡片和账户状态
...@@ -330,13 +329,7 @@ export default { ...@@ -330,13 +329,7 @@ export default {
let url = type === 3 ? 'update_account_status' : 'update_card_status' let url = type === 3 ? 'update_account_status' : 'update_card_status'
$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') {
let dataSource = [...this.accountList] this.queryAccountList()
if (type === 1 || type === 2) {
dataSource[index].cardStatus = status
} else if (type === 3) {
dataSource[index].status = status
}
this.accountList = dataSource
this.$message.success('操作成功') this.$message.success('操作成功')
} }
}).catch(() => { }).catch(() => {
......
...@@ -265,7 +265,6 @@ export default { ...@@ -265,7 +265,6 @@ export default {
let RecordData = this.$qs.stringify({ let RecordData = this.$qs.stringify({
userIds: userIdList, userIds: userIdList,
departmentIds: departmentIdList, departmentIds: departmentIdList,
agentId: '0968162722860917',
money: values.orderPrice, money: values.orderPrice,
endTime: `${values['date-picker']} 23:59:59`, endTime: `${values['date-picker']} 23:59:59`,
remark: values.remark, remark: values.remark,
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
<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 defaultValue="状态" style="width: 120px;margin-right: 20px;" @change="selectHandlestatus">
<!-- <a-select-option value="WAITING_PAYMENT">等待支付</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="WAITING_PAYMENT">等待支付</a-select-option> <a-select-option value="FAILED">审批未通过</a-select-option>
<a-select-option value="SUCCESS">充值成功</a-select-option>
<a-select-option value="FAILED">充值失败</a-select-option>
</a-select> </a-select>
<a-button type="primary" @click="queryRechargeList()">查询</a-button> <a-button type="primary" @click="queryRechargeList()">查询</a-button>
</div> </div>
......
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