Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mingPayPc
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fengzhaoyu
mingPayPc
Commits
25bd2693
Commit
25bd2693
authored
Jul 08, 2019
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
5b25fd05
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
24 deletions
+32
-24
AccountManagement.vue
src/components/pages/PaymentManagement/AccountManagement.vue
+5
-3
RechargeRecord.vue
src/components/pages/PaymentManagement/RechargeRecord.vue
+22
-19
RecordsOfConsumption.vue
...mponents/pages/PaymentManagement/RecordsOfConsumption.vue
+3
-1
main.js
src/main.js
+2
-1
No files found.
src/components/pages/PaymentManagement/AccountManagement.vue
View file @
25bd2693
...
@@ -40,11 +40,13 @@
...
@@ -40,11 +40,13 @@
{{
cardNo
}}
{{
cardNo
}}
</span>
</span>
<span
slot=
"cardStatus"
slot-scope=
"cardStatus, record"
>
<span
slot=
"cardStatus"
slot-scope=
"cardStatus, record"
>
{{
record
.
cardNo
?
cardStatus
===
'UNACTIVE'
?
'已冻结'
:
'已绑卡'
:
'未绑卡'
}}
<a-badge
v-if=
"record.cardNo != '' && cardStatus !== 'UNACTIVE'"
status=
"success"
text=
"已帮卡"
/>
<a-badge
v-else-if=
"record.cardNo != '' && cardStatus === 'UNACTIVE'"
status=
"error"
text=
"已冻结"
/>
<a-badge
v-else
status=
"default"
text=
"未绑卡"
/>
</span>
</span>
<span
slot=
"status"
slot-scope=
"status"
>
<span
slot=
"status"
slot-scope=
"status"
>
<
!--
{{
status
===
MINGPAY_ACCOUNT_STATUS
.
ACTIVE
?
'正常'
:
'已注销并结现'
}}
--
>
<
a-badge
v-if=
"status === MINGPAY_ACCOUNT_STATUS.ACTIVE"
status=
"success"
text=
"正常"
/
>
{{
status
===
MINGPAY_ACCOUNT_STATUS
.
ACTIVE
?
'正常'
:
'已注销'
}}
<a-badge
v-else
status=
"error"
text=
"已注销"
/>
</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>
...
...
src/components/pages/PaymentManagement/RechargeRecord.vue
View file @
25bd2693
...
@@ -35,7 +35,9 @@
...
@@ -35,7 +35,9 @@
</span>
</span>
<span
slot=
"orderNo"
>
单号
</span>
<span
slot=
"orderNo"
>
单号
</span>
<span
slot=
"orderStatus"
slot-scope=
"orderStatus"
>
<span
slot=
"orderStatus"
slot-scope=
"orderStatus"
>
{{
returnStatus
(
orderStatus
)
}}
<a-badge
v-if=
"orderStatus === MINGPAY_CHARGE_ORDERSTATUS.WAITING_PERMIT"
status=
"processing"
text=
"审批中"
/>
<a-badge
v-else-if=
"orderStatus === MINGPAY_CHARGE_ORDERSTATUS.SUCCESS"
status=
"success"
text=
"已完成"
/>
<a-badge
v-else-if=
"orderStatus === MINGPAY_CHARGE_ORDERSTATUS.FAILED"
status=
"error"
text=
"审批未通过"
/>
</span>
</span>
<span
slot=
"createTime"
slot-scope=
"createTime"
>
<span
slot=
"createTime"
slot-scope=
"createTime"
>
{{
createTime
}}
{{
createTime
}}
...
@@ -54,6 +56,7 @@ export default {
...
@@ -54,6 +56,7 @@ export default {
components
:
{},
components
:
{},
data
()
{
data
()
{
return
{
return
{
MINGPAY_CHARGE_ORDERSTATUS
:
MINGPAY_CHARGE_ORDERSTATUS
,
data
:
[],
data
:
[],
columns
:
[{
columns
:
[{
title
:
'成员'
,
title
:
'成员'
,
...
@@ -121,24 +124,24 @@ export default {
...
@@ -121,24 +124,24 @@ export default {
})
})
},
},
// 充值状态
// 充值状态
returnStatus
(
str
)
{
//
returnStatus (str) {
let
status
=
''
//
let status = ''
switch
(
str
)
{
//
switch (str) {
case
MINGPAY_CHARGE_ORDERSTATUS
.
WAITING_PERMIT
:
//
case MINGPAY_CHARGE_ORDERSTATUS.WAITING_PERMIT:
status
=
'审批中'
//
status = '审批中'
break
//
break
case
MINGPAY_CHARGE_ORDERSTATUS
.
SUCCESS
:
//
case MINGPAY_CHARGE_ORDERSTATUS.SUCCESS:
status
=
'已完成'
//
status = '已完成'
break
//
break
case
MINGPAY_CHARGE_ORDERSTATUS
.
FAILED
:
//
case MINGPAY_CHARGE_ORDERSTATUS.FAILED:
status
=
'审批未通过'
//
status = '审批未通过'
break
//
break
case
MINGPAY_CHARGE_ORDERSTATUS
.
WAITING_PAYMENT
:
//
case MINGPAY_CHARGE_ORDERSTATUS.WAITING_PAYMENT:
status
=
'等待支付'
//
status = '等待支付'
break
//
break
}
//
}
return
status
//
return status
},
//
},
// 表格时间格式处理
// 表格时间格式处理
createTimeToStr
(
time
)
{
createTimeToStr
(
time
)
{
let
timeData
=
new
Date
(
parseInt
(
time
))
let
timeData
=
new
Date
(
parseInt
(
time
))
...
...
src/components/pages/PaymentManagement/RecordsOfConsumption.vue
View file @
25bd2693
...
@@ -32,7 +32,9 @@
...
@@ -32,7 +32,9 @@
<span
slot=
"consumptionSubsidyAmount"
>
津贴消费
</span>
<span
slot=
"consumptionSubsidyAmount"
>
津贴消费
</span>
<!--
<span
slot=
"orderNo"
>
单号
</span>
-->
<!--
<span
slot=
"orderNo"
>
单号
</span>
-->
<span
slot=
"orderStatus"
slot-scope=
"orderStatus"
>
<span
slot=
"orderStatus"
slot-scope=
"orderStatus"
>
{{
orderStatus
===
MINGPAY_RECORDS_STATUS
.
SUCCESS
?
'已消费'
:
orderStatus
===
MINGPAY_RECORDS_STATUS
.
WAITING_PERMIT
?
'WAITING_PERMIT'
:
'已退款'
}}
<a-badge
v-if=
"orderStatus === MINGPAY_RECORDS_STATUS.SUCCESS"
status=
"success"
text=
"已消费"
/>
<a-badge
v-else-if=
"orderStatus === MINGPAY_RECORDS_STATUS.WAITING_PERMIT"
status=
"processing"
text=
"审批中"
/>
<a-badge
v-else
status=
"error"
text=
"已退款"
/>
</span>
</span>
<span
slot=
"remark"
>
备注
</span>
<span
slot=
"remark"
>
备注
</span>
<span
slot=
"createTime"
slot-scope=
"createTime"
>
<span
slot=
"createTime"
slot-scope=
"createTime"
>
...
...
src/main.js
View file @
25bd2693
...
@@ -2,7 +2,7 @@ import Vue from 'vue'
...
@@ -2,7 +2,7 @@ import Vue from 'vue'
import
App
from
'./App.vue'
import
App
from
'./App.vue'
import
router
from
'./router'
import
router
from
'./router'
import
store
from
'./store'
import
store
from
'./store'
import
{
Menu
,
Layout
,
Breadcrumb
,
Icon
,
Button
,
DatePicker
,
Input
,
Table
,
Tag
,
Divider
,
Dropdown
,
Modal
,
Form
,
Select
,
message
,
Pagination
,
LocaleProvider
,
Spin
}
from
'ant-design-vue'
import
{
Menu
,
Layout
,
Breadcrumb
,
Icon
,
Button
,
DatePicker
,
Input
,
Table
,
Tag
,
Divider
,
Dropdown
,
Modal
,
Form
,
Select
,
message
,
Pagination
,
LocaleProvider
,
Spin
,
Badge
}
from
'ant-design-vue'
import
'ant-design-vue/dist/antd.css'
import
'ant-design-vue/dist/antd.css'
import
{
config
}
from
'./api/config'
import
{
config
}
from
'./api/config'
import
axios
from
'axios'
import
axios
from
'axios'
...
@@ -11,6 +11,7 @@ import qs from 'qs'
...
@@ -11,6 +11,7 @@ import qs from 'qs'
Vue
.
use
(
Layout
)
Vue
.
use
(
Layout
)
Vue
.
use
(
LocaleProvider
)
Vue
.
use
(
LocaleProvider
)
Vue
.
use
(
Menu
)
Vue
.
use
(
Menu
)
Vue
.
use
(
Badge
)
Vue
.
use
(
Spin
)
Vue
.
use
(
Spin
)
Vue
.
use
(
Breadcrumb
)
Vue
.
use
(
Breadcrumb
)
Vue
.
use
(
Icon
)
Vue
.
use
(
Icon
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment