Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bms-vue-obear
Project
Project
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
daywrite
bms-vue-obear
Commits
d2533c2c
Commit
d2533c2c
authored
Apr 18, 2019
by
huai.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
费用报销查询条件增加时间
parent
3e620ed6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
148 additions
and
9 deletions
+148
-9
timeSearchForm.vue
src/components/common/timeSearchForm.vue
+121
-0
reimbursementHome.vue
src/components/reimbursement_list/reimbursementHome.vue
+27
-9
No files found.
src/components/common/timeSearchForm.vue
0 → 100644
View file @
d2533c2c
<
template
>
<section>
<el-row
class=
"form-content-time-top"
>
<el-form
ref=
"clientTimeForm"
:model=
"clientTimeForm"
size=
"mini"
>
<el-col
:span=
"8"
:xs=
"24"
>
<el-form-item
label=
"成交日期:"
label-width=
"42"
>
<el-radio-group
v-model=
"clientTimeForm[formSearchKey + '[period]']"
size=
"mini"
>
<el-radio-button
label=
"thisweek"
>
本周
</el-radio-button>
<el-radio-button
label=
"lastweek"
>
上周
</el-radio-button>
<el-radio-button
label=
"thismonth"
>
本月
</el-radio-button>
<el-radio-button
label=
"lastmonth"
>
上月
</el-radio-button>
<el-radio-button
label=
"nextmonth"
>
下月
</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
</el-form>
<el-form
ref=
"clientTimeRange"
:model=
"clientTimeRange"
size=
"mini"
>
<el-col
:span=
"8"
:offset=
"8"
:xs=
"
{span: 24, offset: 0}" class="form-content-time-range">
<el-form-item
label-width=
"0"
>
<el-date-picker
size=
"mini"
v-model=
"clientTimeRange.from"
type=
"date"
value-format=
"yyyy-MM-dd"
placeholder=
"开始时间"
>
</el-date-picker>
至
<el-date-picker
size=
"mini"
v-model=
"clientTimeRange.to"
type=
"date"
value-format=
"yyyy-MM-dd"
placeholder=
"结束时间"
>
</el-date-picker>
<el-button
type=
"primary"
size=
"mini"
@
click=
"setSearchTime"
>
确定
</el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
</section>
</
template
>
<
script
>
import
setParams
from
'./setParams'
export
default
{
name
:
'timeSearchForm'
,
mixins
:
[
setParams
],
props
:
[
'formSearchKey'
],
data
()
{
return
{
clientTimeForm
:
{},
clientTimeRange
:
{
from
:
''
,
to
:
''
}
}
},
created
()
{
this
.
initParams
()
this
.
init
()
},
methods
:
{
init
()
{
this
.
$watch
(
'clientTimeForm'
,
(
val
)
=>
{
let
perid
=
val
[
this
.
formSearchKey
+
'[period]'
]
this
.
$emit
(
'update:list'
,
Object
.
assign
({},
{[
this
.
formSearchKey
+
'[period]'
]:
perid
}))
},
{
deep
:
true
})
},
initParams
()
{
this
.
setInitParams
((
ret
)
=>
{
this
.
$set
(
this
.
clientTimeForm
,
this
.
formSearchKey
+
'[period]'
,
ret
[
this
.
formSearchKey
+
'[period]'
]
||
''
)
})
},
setSearchTime
()
{
let
from
=
this
.
clientTimeRange
.
from
let
to
=
this
.
clientTimeRange
.
to
this
.
$emit
(
'update:list'
,
Object
.
assign
({},
{
[
this
.
formSearchKey
+
'[from]'
]:
from
,
[
this
.
formSearchKey
+
'[to]'
]:
to
},
this
.
clientTimeForm
))
}
},
watch
:
{
'formSearchKey'
:
{
handler
(
val
)
{
this
.
$set
(
this
.
clientTimeForm
,
val
+
'[period]'
,
''
)
}
},
'clientTimeRange.from'
(
val
)
{
if
(
new
Date
(
val
)
>=
new
Date
(
this
.
clientTimeRange
.
to
))
{
this
.
clientTimeRange
.
to
=
val
}
},
'clientTimeRange.to'
(
val
)
{
if
(
new
Date
(
val
)
<=
new
Date
(
this
.
clientTimeRange
.
from
))
{
this
.
clientTimeRange
.
from
=
val
}
}
}
}
</
script
>
<
style
scoped
>
.form-content-time-top
{
background
:
#FFF
;
}
.form-content-time-top
.el-form-item
{
margin
:
7px
0
9px
;
}
.form-content-time-top
.el-col
{
padding
:
0
15px
;
}
</
style
>
src/components/reimbursement_list/reimbursementHome.vue
View file @
d2533c2c
...
@@ -9,6 +9,11 @@
...
@@ -9,6 +9,11 @@
@
update:headerSearch=
"search => searchKeyword(search)"
@
update:headerSearch=
"search => searchKeyword(search)"
@
update:headerAdd=
"() => addSch()"
>
@
update:headerAdd=
"() => addSch()"
>
</search-header>
</search-header>
<time-search-form
ref=
"timeSearchForm"
form-search-key=
"projectSearch"
@
update:list=
"search => timeSearchForm(search)"
>
</time-search-form>
<search-form
<search-form
ref=
"clientForm"
ref=
"clientForm"
:filter=
"filter"
:filter=
"filter"
...
@@ -58,20 +63,23 @@
...
@@ -58,20 +63,23 @@
<
script
>
<
script
>
import
SearchHeader
from
'../common/searchHeader'
import
SearchHeader
from
'../common/searchHeader'
import
TimeSearchForm
from
'../common/timeSearchForm'
import
SearchForm
from
'../common/SearchForm'
import
SearchForm
from
'../common/SearchForm'
import
ReimItem
from
'./reimbursementItem'
import
ReimItem
from
'./reimbursementItem'
import
ReimModal
from
'../reimbursement/reimbursementModal'
import
ReimModal
from
'../reimbursement/reimbursementModal'
import
CountArr
from
'./countArr'
import
CountArr
from
'./countArr'
// import LeaveMessage from '../common/leaveMessage'
import
Pagenation
from
'./reimbursementPagenation'
import
Pagenation
from
'./reimbursementPagenation'
import
clickOutside
from
'@/lib/bind'
import
clickOutside
from
'@/lib/bind'
import
singleRadioTool
from
'../common/singleRadioTool'
import
singleRadioTool
from
'../common/singleRadioTool'
import
SetParams
from
'../common/setParams'
import
{
import
{
requestAPI
,
requestAPI
,
api
api
}
from
'@/lib/commonMixin'
}
from
'@/lib/commonMixin'
export
default
{
export
default
{
name
:
''
,
name
:
'reimbursementHome'
,
mixins
:
[
SetParams
],
components
:
{
components
:
{
SearchHeader
,
SearchHeader
,
...
@@ -80,7 +88,8 @@ export default {
...
@@ -80,7 +88,8 @@ export default {
ReimModal
,
ReimModal
,
CountArr
,
CountArr
,
Pagenation
,
Pagenation
,
singleRadioTool
singleRadioTool
,
TimeSearchForm
},
},
directives
:
{
directives
:
{
...
@@ -158,8 +167,20 @@ export default {
...
@@ -158,8 +167,20 @@ export default {
this
.
getList
()
this
.
getList
()
},
},
timeSearchForm
(
search
)
{
let
params
=
this
.
setParams
({
...
this
.
form
,
page
:
this
.
pagenation
.
thispage
},
search
)
this
.
getList
(
params
)
},
searchKeyword
(
search
)
{
searchKeyword
(
search
)
{
this
.
updateForm
(
search
)
let
params
=
this
.
setParams
({
...
this
.
form
,
page
:
this
.
pagenation
.
thispage
},
search
)
this
.
getList
(
params
)
},
},
updateForm
(
search
)
{
updateForm
(
search
)
{
...
@@ -215,11 +236,8 @@ export default {
...
@@ -215,11 +236,8 @@ export default {
})
})
},
},
getList
()
{
getList
(
params
)
{
requestAPI
(
api
.
getReimList
,
{
requestAPI
(
api
.
getReimList
,
params
).
then
((
res
)
=>
{
...
this
.
form
,
page
:
this
.
pagenation
.
thispage
}).
then
((
res
)
=>
{
const
{
const
{
list
=
[],
list
=
[],
countArr
=
[],
countArr
=
[],
...
...
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