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
adaaf5ea
Commit
adaaf5ea
authored
Jun 27, 2019
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
时间组件和津贴详情更新
parent
7bfdc932
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
7 deletions
+19
-7
constant.js
src/api/constant.js
+2
-2
AccountManagement.vue
src/components/pages/PaymentManagement/AccountManagement.vue
+4
-0
AllowancePayment.vue
src/components/pages/PaymentManagement/AllowancePayment.vue
+2
-1
CashierManagement.vue
src/components/pages/PaymentManagement/CashierManagement.vue
+2
-2
RecordsOfConsumption.vue
...mponents/pages/PaymentManagement/RecordsOfConsumption.vue
+1
-1
ViewAllowances.vue
src/components/pages/PaymentManagement/ViewAllowances.vue
+8
-1
No files found.
src/api/constant.js
View file @
adaaf5ea
const
MINGPAY_CONSTANT
=
{
const
MINGPAY_CONSTANT
=
{
MINGPAY_CONSTANT_URL
:
'http://mingpay-web-beta.mingwork.com:8888/'
,
//
MINGPAY_CONSTANT_URL: 'http://mingpay-web-beta.mingwork.com:8888/',
//
MINGPAY_CONSTANT_URL: 'http://ming.vaiwan.com/',
MINGPAY_CONSTANT_URL
:
'http://ming.vaiwan.com/'
,
MINGPAY_CONSTANT_AGENTID
:
270198704
,
MINGPAY_CONSTANT_AGENTID
:
270198704
,
MINGPAY_CONSTANT_VERSION
:
'v1'
MINGPAY_CONSTANT_VERSION
:
'v1'
}
}
...
...
src/components/pages/PaymentManagement/AccountManagement.vue
View file @
adaaf5ea
...
@@ -250,6 +250,10 @@ export default {
...
@@ -250,6 +250,10 @@ export default {
departments
:
[],
departments
:
[],
users
:
[]
users
:
[]
}
}
this
.
searchSource
.
ddchoosePeople
=
{
userIdList
:
[],
departmentIdList
:
[]
}
},
},
// 用户头像处理
// 用户头像处理
avatarCanvasFn
(
name
)
{
avatarCanvasFn
(
name
)
{
...
...
src/components/pages/PaymentManagement/AllowancePayment.vue
View file @
adaaf5ea
...
@@ -182,7 +182,8 @@ export default {
...
@@ -182,7 +182,8 @@ export default {
},
},
disabledDate
(
current
)
{
disabledDate
(
current
)
{
// Can not select days before today and today
// Can not select days before today and today
return
current
&&
current
<
moment
().
endOf
(
'day'
)
console
.
log
(
moment
().
endOf
(
'day'
))
return
current
<
moment
(
Date
.
now
()).
add
(
-
1
,
'day'
)
},
},
// 获取消费列表
// 获取消费列表
queryRecordList
()
{
queryRecordList
()
{
...
...
src/components/pages/PaymentManagement/CashierManagement.vue
View file @
adaaf5ea
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
</div>
</div>
<a-table
:columns=
"columns"
:dataSource=
"cashierManagementList"
size=
"default"
rowKey=
"id"
:pagination=
"pagination"
@
change=
"handleTableChange"
>
<a-table
:columns=
"columns"
:dataSource=
"cashierManagementList"
size=
"default"
rowKey=
"id"
:pagination=
"pagination"
@
change=
"handleTableChange"
>
<span
slot=
"name"
>
成员
</span>
<span
slot=
"name"
>
成员
</span>
<span
slot=
"create
Time"
slot-scope=
"createTim
e"
>
<span
slot=
"create
Date"
slot-scope=
"createDat
e"
>
{{
createTimeToStr
(
create
Tim
e
)
}}
{{
createTimeToStr
(
create
Dat
e
)
}}
</span>
</span>
<span
slot=
"action"
slot-scope=
"text, record, index"
>
<span
slot=
"action"
slot-scope=
"text, record, index"
>
<a
v-if=
"record.status === '0'"
href=
"javascript:;"
@
click=
"showModel(record, text, index)"
>
删除
</a>
<a
v-if=
"record.status === '0'"
href=
"javascript:;"
@
click=
"showModel(record, text, index)"
>
删除
</a>
...
...
src/components/pages/PaymentManagement/RecordsOfConsumption.vue
View file @
adaaf5ea
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<a-select-option
value=
"REFUND_SUCCESS"
>
已退款
</a-select-option>
<a-select-option
value=
"REFUND_SUCCESS"
>
已退款
</a-select-option>
</a-select>
</a-select>
<a-select
placeholder=
"收银员"
:allowClear=
"true"
style=
"width: 120px;margin-right: 20px;"
@
change=
"selectagent"
>
<a-select
placeholder=
"收银员"
:allowClear=
"true"
style=
"width: 120px;margin-right: 20px;"
@
change=
"selectagent"
>
<a-select-option
v-for=
"item in agentList"
:value=
"item.userId"
:key=
"item"
>
{{
item
.
name
}}
</a-select-option>
<a-select-option
v-for=
"item in agentList"
:value=
"item.userId"
:key=
"item
.userId
"
>
{{
item
.
name
}}
</a-select-option>
</a-select>
</a-select>
<a-button
type=
"primary"
@
click=
"search()"
>
查询
</a-button>
<a-button
type=
"primary"
@
click=
"search()"
>
查询
</a-button>
</div>
</div>
...
...
src/components/pages/PaymentManagement/ViewAllowances.vue
View file @
adaaf5ea
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<div
class=
"viewAllowances"
>
<div
class=
"viewAllowances"
>
<a-button
type=
"primary"
@
click=
"back()"
><img
style=
"margin-top:-4px;margin-right: 6px;width: 14px"
src=
"../../../assets/back.png"
/>
返回
</a-button>
<a-button
type=
"primary"
@
click=
"back()"
><img
style=
"margin-top:-4px;margin-right: 6px;width: 14px"
src=
"../../../assets/back.png"
/>
返回
</a-button>
<div
class=
"title"
>
查看津贴
</div>
<div
class=
"title"
>
查看津贴
</div>
<a-table
:columns=
"columns"
:dataSource=
"subsidyList"
size=
"default"
rowKey=
"
grantNumber
"
:pagination=
"pagination"
@
change=
"handleTableChange"
>
<a-table
:columns=
"columns"
:dataSource=
"subsidyList"
size=
"default"
rowKey=
"
couponId
"
:pagination=
"pagination"
@
change=
"handleTableChange"
>
<span
slot=
"type"
slot-scope=
"type"
>
<span
slot=
"type"
slot-scope=
"type"
>
{{
type
===
'travel'
?
'交通补贴'
:
'餐补'
}}
{{
type
===
'travel'
?
'交通补贴'
:
'餐补'
}}
</span>
</span>
...
@@ -11,6 +11,9 @@
...
@@ -11,6 +11,9 @@
<span
slot=
"endTime"
slot-scope=
"endTime"
>
<span
slot=
"endTime"
slot-scope=
"endTime"
>
{{
timeToStr
(
endTime
)
}}
{{
timeToStr
(
endTime
)
}}
</span>
</span>
<span
slot=
"creatTime"
slot-scope=
"creatTime"
>
{{
timeToStr
(
creatTime
)
}}
</span>
</a-table>
</a-table>
</div>
</div>
</
template
>
</
template
>
...
@@ -36,6 +39,10 @@ export default {
...
@@ -36,6 +39,10 @@ export default {
title
:
'截止日期'
,
title
:
'截止日期'
,
dataIndex
:
'endTime'
,
dataIndex
:
'endTime'
,
scopedSlots
:
{
customRender
:
'endTime'
}
scopedSlots
:
{
customRender
:
'endTime'
}
},
{
title
:
'创建日期'
,
dataIndex
:
'creatTime'
,
scopedSlots
:
{
customRender
:
'creatTime'
}
}],
}],
pagination
:
{
pagination
:
{
current
:
1
,
current
:
1
,
...
...
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