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
1b759ef8
Commit
1b759ef8
authored
Apr 19, 2019
by
huai.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
下班提交
parent
b6d441b9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
8 deletions
+37
-8
reimbursement.js
src/apis/reimbursement.js
+9
-0
reimbursementForm.vue
src/components/reimbursement/reimbursementForm.vue
+21
-4
reimbursementModal.vue
src/components/reimbursement/reimbursementModal.vue
+7
-4
No files found.
src/apis/reimbursement.js
View file @
1b759ef8
...
@@ -7,5 +7,14 @@ export default {
...
@@ -7,5 +7,14 @@ export default {
},
},
getReimNew
:
{
getReimNew
:
{
url
:
'/vue/reimbursement/get-new'
url
:
'/vue/reimbursement/get-new'
},
searchProjectByClientId
:
{
url
:
'/vue/search/project-by-client-id'
},
saveNewReim
:
{
url
:
'/vue/reimbursement/save-new'
},
saveEditReim
:
{
url
:
'/vue/reimbursement/save-edit'
}
}
}
}
src/components/reimbursement/reimbursementForm.vue
View file @
1b759ef8
...
@@ -45,14 +45,14 @@
...
@@ -45,14 +45,14 @@
:value=
"option.key"
></el-option>
:value=
"option.key"
></el-option>
</el-select>
</el-select>
</el-form-item>
-->
</el-form-item>
-->
<
!--
<el-form-item
label=
"项目名称:"
prop=
"client_id"
class=
"ec-clear-left ec-form-item-lg is-required
"
>
<
el-form-item
label=
"项目名称:"
prop=
"project_id"
class=
"ec-clear-left ec-form-item-lg
"
>
<el-select
v-model=
"model.
client_id
"
placeholder=
"请选择"
>
<el-select
v-model=
"model.
project_id"
size=
"small
"
placeholder=
"请选择"
>
<el-option
v-for=
"(option, optKey) in
item.value
"
<el-option
v-for=
"(option, optKey) in
options.projectArray
"
:key=
"optKey"
:key=
"optKey"
:label=
"option.name"
:label=
"option.name"
:value=
"option.key"
></el-option>
:value=
"option.key"
></el-option>
</el-select>
</el-select>
</el-form-item>
-->
</el-form-item>
<el-form-item
label=
"审核人:"
prop=
"form_reimbursementVerifyRels"
class=
"ec-clear-left ec-form-item-lg is-required"
>
<el-form-item
label=
"审核人:"
prop=
"form_reimbursementVerifyRels"
class=
"ec-clear-left ec-form-item-lg is-required"
>
<el-select
v-model=
"model.form_reimbursementVerifyRels"
size=
"small"
multiple
placeholder=
"请选择"
>
<el-select
v-model=
"model.form_reimbursementVerifyRels"
size=
"small"
multiple
placeholder=
"请选择"
>
<el-option
v-for=
"(option, optKey) in reimbursementVerifyRels"
<el-option
v-for=
"(option, optKey) in reimbursementVerifyRels"
...
@@ -91,6 +91,10 @@ import settleAccountSelect from './settleAccountSelect'
...
@@ -91,6 +91,10 @@ import settleAccountSelect from './settleAccountSelect'
import
singleRadio
from
'../common/singleRadio'
import
singleRadio
from
'../common/singleRadio'
import
settingMixin
from
'../common/settingMixin'
import
settingMixin
from
'../common/settingMixin'
import
depSelect
from
'../schedule/depSelect'
import
depSelect
from
'../schedule/depSelect'
import
{
requestAPI
,
api
}
from
'@/lib/commonMixin'
export
default
{
export
default
{
name
:
'scheduleForm'
,
name
:
'scheduleForm'
,
...
@@ -113,12 +117,18 @@ export default {
...
@@ -113,12 +117,18 @@ export default {
return
time
.
getTime
()
<
Date
.
now
()
-
8.64e7
return
time
.
getTime
()
<
Date
.
now
()
-
8.64e7
}
}
},
},
options
:
{
projectArray
:
[]
},
rules
:
{},
rules
:
{},
query
:
{}
query
:
{}
}
}
},
},
created
()
{
created
()
{
this
.
$watch
(
'model.client_id'
,
function
(
val
)
{
this
.
getProjectArray
(
val
)
})
},
},
mounted
()
{
mounted
()
{
...
@@ -129,6 +139,13 @@ export default {
...
@@ -129,6 +139,13 @@ export default {
},
},
methods
:
{
methods
:
{
getProjectArray
(
id
)
{
requestAPI
(
api
.
searchProjectByClientId
,
{
client_id
:
id
}).
then
(
res
=>
{
this
.
options
.
projectArray
=
res
})
}
}
}
}
}
</
script
>
</
script
>
...
...
src/components/reimbursement/reimbursementModal.vue
View file @
1b759ef8
...
@@ -37,7 +37,9 @@ export default {
...
@@ -37,7 +37,9 @@ export default {
client_name
:
''
,
// 客户
client_name
:
''
,
// 客户
form_reimbursementVerifyRels
:
[],
form_reimbursementVerifyRels
:
[],
form_reimbursementCarbonCopyRels
:
[],
form_reimbursementCarbonCopyRels
:
[],
description
:
''
description
:
''
,
project_id
:
''
,
attachmentFiles
:
[]
}
}
}
}
},
},
...
@@ -60,9 +62,10 @@ export default {
...
@@ -60,9 +62,10 @@ export default {
},
},
save
()
{
save
()
{
let
_params
=
Object
.
assign
({},
setModule
(
this
.
model
,
'Schedules'
))
console
.
log
(
this
.
model
)
let
_apiUrl
=
!
this
.
model
.
id
?
api
.
saveNewSchedule
:
api
.
saveEditSchedule
let
_params
=
Object
.
assign
({},
setModule
(
this
.
model
,
'Reimbursements'
))
!
this
.
model
.
id
&&
delete
_params
[
'Schedules[id]'
]
let
_apiUrl
=
!
this
.
model
.
id
?
api
.
saveNewReim
:
api
.
saveEditReim
!
this
.
model
.
id
&&
delete
_params
[
'Reimbursements[id]'
]
requestAPI
(
Object
.
assign
(
_apiUrl
,
{
method
:
'POST'
}),
_params
)
requestAPI
(
Object
.
assign
(
_apiUrl
,
{
method
:
'POST'
}),
_params
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
this
.
$refs
.
scheduleSidePopup
.
close
()
this
.
$refs
.
scheduleSidePopup
.
close
()
...
...
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