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
f06a3437
Commit
f06a3437
authored
Jul 22, 2019
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增津贴状态
parent
139a882d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
10 deletions
+28
-10
axios.js
src/api/axios.js
+2
-2
constant.js
src/api/constant.js
+7
-1
AllowancePayment.vue
src/components/pages/PaymentManagement/AllowancePayment.vue
+19
-7
No files found.
src/api/axios.js
View file @
f06a3437
import
axios
from
'axios'
import
qs
from
'qs'
// axios.defaults.baseURL = 'http://192.168.1.101:8300' // 本地荣
//
axios.defaults.baseURL = 'http://192.168.1.102:8300' // 本地钱
axios
.
defaults
.
baseURL
=
'http://139.196.213.18:8300'
// beta环境
axios
.
defaults
.
baseURL
=
'http://192.168.1.102:8300'
// 本地钱
//
axios.defaults.baseURL = 'http://139.196.213.18:8300' // beta环境
let
loadingInstance
// 创建Loading 的实例
// axios.defaults.headers.post['Content-Type'] = 'application/json; charset=utf-8'
// axios.defaults.crossDomain = true
...
...
src/api/constant.js
View file @
f06a3437
...
...
@@ -24,5 +24,11 @@ const MINGPAY_RECORDS_STATUS = {
WAITING_PERMIT
:
'WAITING_PERMIT'
,
// 退款等待审批
REFUND_SUCCESS
:
'REFUND_SUCCESS'
// 退款成功
}
// 津贴状态
const
MINGPAY_SUBSIDY_STATUS
=
{
SUCCESS
:
'SUCCESS'
,
WAITING_PERMIT
:
'WAITING_PERMIT'
,
REFUSE_PERMIT
:
'REFUSE_PERMIT'
}
export
{
MINGPAY_CONSTANT
,
MINGPAY_ACCOUNT_STATUS
,
MINGPAY_CHARGE_ORDERSTATUS
,
MINGPAY_RECORDS_STATUS
}
export
{
MINGPAY_CONSTANT
,
MINGPAY_ACCOUNT_STATUS
,
MINGPAY_CHARGE_ORDERSTATUS
,
MINGPAY_RECORDS_STATUS
,
MINGPAY_SUBSIDY_STATUS
}
src/components/pages/PaymentManagement/AllowancePayment.vue
View file @
f06a3437
...
...
@@ -24,12 +24,17 @@
<span
slot=
"recipient"
>
成员
</span>
<span
slot=
"money"
>
金额
</span>
<span
slot=
"type"
slot-scope=
"type"
>
{{
type
===
'TRAVEL'
?
'交通补助'
:
'餐补'
}}
</span>
<
span
slot=
"grantNumber"
>
单号
</span
>
<
!--
<span
slot=
"grantNumber"
>
单号
</span>
--
>
<span
slot=
"agentId"
>
经办人
</span>
<span
slot=
"createTime"
slot-scope=
"createTime"
>
{{
createTimeToStr
(
createTime
)
}}
</span>
<span
slot=
"remark"
>
备注
</span>
<span
slot=
"couponRecordStatus"
slot-scope=
"couponRecordStatus"
>
<a-badge
v-if=
"couponRecordStatus === MINGPAY_SUBSIDY_STATUS.WAITING_PERMIT"
status=
"processing"
text=
"审批中"
/>
<a-badge
v-else-if=
"couponRecordStatus === MINGPAY_SUBSIDY_STATUS.SUCCESS"
status=
"success"
text=
"已完成"
/>
<a-badge
v-else-if=
"couponRecordStatus === MINGPAY_SUBSIDY_STATUS.FAILED"
status=
"error"
text=
"审批未通过"
/>
</span>
<span
slot=
"action"
slot-scope=
"text, record, index"
class=
"operationTable"
>
<a
href=
"javascript:;"
@
click=
"toAllowanceDetails(record, text, index)"
>
查看详情
</a>
</span>
...
...
@@ -90,12 +95,13 @@
<
script
>
import
{
config
}
from
'./../../../api/config.js'
import
{
$http
}
from
'./../../../api/axios.js'
import
{
MINGPAY_
RECORDS
_STATUS
}
from
'./../../../api/constant'
import
{
MINGPAY_
SUBSIDY
_STATUS
}
from
'./../../../api/constant'
import
moment
from
'moment'
export
default
{
name
:
'AllowancePayment'
,
data
()
{
return
{
MINGPAY_SUBSIDY_STATUS
:
MINGPAY_SUBSIDY_STATUS
,
spinning
:
false
,
delayTime
:
100
,
formItemLayout
:
{
...
...
@@ -111,7 +117,7 @@ export default {
columns
:
[{
title
:
'成员'
,
dataIndex
:
'recipient'
,
width
:
'20
%
'
width
:
'20
0px
'
},
{
title
:
'金额'
,
dataIndex
:
'money'
...
...
@@ -119,13 +125,19 @@ export default {
title
:
'津贴类型'
,
dataIndex
:
'type'
,
scopedSlots
:
{
customRender
:
'type'
}
},
{
title
:
'单号'
,
dataIndex
:
'grantNumber'
},
{
},
// {
// title: '单号',
// dataIndex: 'grantNumber'
// },
{
title
:
'经办人'
,
dataIndex
:
'agentId'
},
{
title
:
'状态'
,
dataIndex
:
'couponRecordStatus'
,
scopedSlots
:
{
customRender
:
'couponRecordStatus'
}
},
{
title
:
'备注'
,
dataIndex
:
'remark'
},
{
...
...
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