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
c6342626
Commit
c6342626
authored
Jun 21, 2019
by
daywrite
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决第一轮bug
parent
9ba66384
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
59 additions
and
32 deletions
+59
-32
account-app.scss
src/assets/css/account-app.scss
+14
-1
schedule-app.scss
src/assets/css/schedule-app.scss
+15
-1
accountForm.vue
src/components/account/accountForm.vue
+16
-16
accountHome.vue
src/components/account_list/accountHome.vue
+1
-1
caseModal.vue
src/components/case/caseModal.vue
+1
-1
caseItem.vue
src/components/case_list/caseItem.vue
+3
-3
scheduleItem.vue
src/components/common/scheduleItem.vue
+2
-2
scheduleForm.vue
src/components/schedule/scheduleForm.vue
+5
-5
serviceHome.vue
src/components/service_list/serviceHome.vue
+1
-1
serviceItem.vue
src/components/service_list/serviceItem.vue
+1
-1
No files found.
src/assets/css/account-app.scss
View file @
c6342626
.accounts-app
{
.accounts-app
{
label
.el-form-item__label
{
font-size
:
12px
;
position
:relative
;
font-weight
:
normal
;
}
.is-required-end
>
.el-form-item__label
:after
{
content
:
"*"
;
color
:
#eb7567
;
vertical-align
:
middle
;
position
:absolute
;
top
:
3px
;
right
:
3px
;
}
.color-649FD7
{
.color-649FD7
{
color
:
#649FD7
color
:
#649FD7
}
}
...
@@ -13,7 +26,7 @@
...
@@ -13,7 +26,7 @@
margin-bottom
:
2px
;
margin-bottom
:
2px
;
}
}
.el-form-item__content
{
.el-form-item__content
{
line-height
:
5px
;
//
line-height:5px;
}
}
.el-checkbox__label
{
.el-checkbox__label
{
color
:
white
;
color
:
white
;
...
...
src/assets/css/schedule-app.scss
View file @
c6342626
.schedule-app
{
.schedule-app
{
label
.el-form-item__label
{
font-size
:
12px
;
position
:relative
;
font-weight
:
normal
;
}
.is-required-end
>
.el-form-item__label
:after
{
content
:
"*"
;
color
:
#eb7567
;
vertical-align
:
middle
;
position
:absolute
;
top
:
3px
;
right
:
3px
;
}
.mb20
{
.mb20
{
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
...
...
src/components/account/accountForm.vue
View file @
c6342626
<
template
>
<
template
>
<section
class=
"ec-page-wrapper"
style=
"overflow: hidden; padding-bottom: 0px;"
>
<section
class=
"ec-page-wrapper"
style=
"overflow: hidden; padding-bottom: 0px;"
>
<el-form
label-width=
"120px"
ref=
"form"
:rules=
"rules"
:model=
"model"
class=
"ec-create-form"
>
<el-form
label-width=
"120px"
ref=
"form"
:rules=
"rules"
:model=
"model"
class=
"ec-create-form"
>
<el-form-item
label=
"姓名
:"
prop=
"name"
class=
"ec-clear-left is-require
d"
>
<el-form-item
label=
"姓名
"
prop=
"name"
class=
"ec-clear-left is-required-en
d"
>
<el-input
<el-input
class=
"ec-input-normal"
class=
"ec-input-normal"
size=
"mini"
size=
"mini"
v-model
.
trim=
"model.name"
>
v-model
.
trim=
"model.name"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"电子邮箱
:"
prop=
"email"
class=
"ec-clear-left is-require
d"
>
<el-form-item
label=
"电子邮箱
"
prop=
"email"
class=
"ec-clear-left is-required-en
d"
>
<el-input
<el-input
class=
"ec-input-normal"
class=
"ec-input-normal"
size=
"mini"
size=
"mini"
v-model
.
trim=
"model.email"
>
v-model
.
trim=
"model.email"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"性别
:"
prop=
"sex"
class=
"ec-clear-left ec-form-item-lg is-require
d"
>
<el-form-item
label=
"性别
"
prop=
"sex"
class=
"ec-clear-left ec-form-item-lg is-required-en
d"
>
<el-select
v-model=
"model.sex"
size=
"small"
placeholder=
"请选择"
>
<el-select
v-model=
"model.sex"
size=
"small"
placeholder=
"请选择"
>
<el-option
v-for=
"(option, optKey) in accountSexArray"
<el-option
v-for=
"(option, optKey) in accountSexArray"
:key=
"optKey"
:key=
"optKey"
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
: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=
"birth_date"
class=
"ec-clear-left
"
>
<el-form-item
label=
"生日
"
prop=
"birth_date"
class=
"ec-clear-left is-required-end
"
>
<el-date-picker
<el-date-picker
size=
"small"
size=
"small"
v-model=
"model.birth_date"
v-model=
"model.birth_date"
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
placeholder=
"选择日期时间"
>
placeholder=
"选择日期时间"
>
</el-date-picker>
</el-date-picker>
</el-form-item>
</el-form-item>
<el-form-item
label=
"入职日期
:"
prop=
"entry_date"
class=
"ec-clear-left
"
>
<el-form-item
label=
"入职日期
"
prop=
"entry_date"
class=
"ec-clear-left is-required-end
"
>
<el-date-picker
<el-date-picker
size=
"small"
size=
"small"
v-model=
"model.entry_date"
v-model=
"model.entry_date"
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
placeholder=
"选择日期时间"
>
placeholder=
"选择日期时间"
>
</el-date-picker>
</el-date-picker>
</el-form-item>
</el-form-item>
<el-form-item
label=
"部门
:"
prop=
"department_id"
class=
"ec-clear-left ec-form-item-lg is-require
d"
>
<el-form-item
label=
"部门
"
prop=
"department_id"
class=
"ec-clear-left ec-form-item-lg is-required-en
d"
>
<el-select
v-model=
"model.department_id"
size=
"small"
placeholder=
"请选择"
>
<el-select
v-model=
"model.department_id"
size=
"small"
placeholder=
"请选择"
>
<el-option
v-for=
"(option, optKey) in accountDepartmentIds"
<el-option
v-for=
"(option, optKey) in accountDepartmentIds"
:key=
"optKey"
:key=
"optKey"
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
: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=
"department_position_id"
class=
"ec-clear-left ec-form-item-lg is-require
d"
>
<el-form-item
label=
"职位
"
prop=
"department_position_id"
class=
"ec-clear-left ec-form-item-lg is-required-en
d"
>
<el-select
v-model=
"model.department_position_id"
size=
"small"
placeholder=
"请选择"
>
<el-select
v-model=
"model.department_position_id"
size=
"small"
placeholder=
"请选择"
>
<el-option
v-for=
"(option, optKey) in options.depPosIds"
<el-option
v-for=
"(option, optKey) in options.depPosIds"
:key=
"optKey"
:key=
"optKey"
...
@@ -59,14 +59,14 @@
...
@@ -59,14 +59,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=
"mobile"
class=
"ec-clear-left is-required
"
>
<el-form-item
label=
"手机
"
prop=
"mobile"
class=
"ec-clear-left
"
>
<el-input
<el-input
class=
"ec-input-normal"
class=
"ec-input-normal"
size=
"mini"
size=
"mini"
v-model
.
trim=
"model.mobile"
>
v-model
.
trim=
"model.mobile"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"座机
:"
prop=
"telephone_area_code"
class=
"ec-clear-left is-required
"
>
<el-form-item
label=
"座机
"
prop=
"telephone_area_code"
class=
"ec-clear-left
"
>
<el-input
<el-input
class=
"ec-input-normal"
class=
"ec-input-normal"
size=
"mini"
size=
"mini"
...
@@ -82,46 +82,46 @@
...
@@ -82,46 +82,46 @@
<el-input
<el-input
class=
"ec-input-normal"
class=
"ec-input-normal"
size=
"mini"
size=
"mini"
style=
"width:
100
px;"
style=
"width:
97
px;"
v-model
.
trim=
"model.telephone_extension_number"
>
v-model
.
trim=
"model.telephone_extension_number"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"身份证号码
:"
prop=
"id_number"
class=
"ec-clear-left is-required
"
>
<el-form-item
label=
"身份证号码
"
prop=
"id_number"
class=
"ec-clear-left
"
>
<el-input
<el-input
class=
"ec-input-normal"
class=
"ec-input-normal"
size=
"mini"
size=
"mini"
v-model
.
trim=
"model.id_number"
>
v-model
.
trim=
"model.id_number"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"籍贯
:"
prop=
"native_place"
class=
"ec-clear-left is-required
"
>
<el-form-item
label=
"籍贯
"
prop=
"native_place"
class=
"ec-clear-left
"
>
<el-input
<el-input
class=
"ec-input-normal"
class=
"ec-input-normal"
size=
"mini"
size=
"mini"
v-model
.
trim=
"model.native_place"
>
v-model
.
trim=
"model.native_place"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"毕业院校
:"
prop=
"graduate_school"
class=
"ec-clear-left is-required
"
>
<el-form-item
label=
"毕业院校
"
prop=
"graduate_school"
class=
"ec-clear-left
"
>
<el-input
<el-input
class=
"ec-input-normal"
class=
"ec-input-normal"
size=
"mini"
size=
"mini"
v-model
.
trim=
"model.graduate_school"
>
v-model
.
trim=
"model.graduate_school"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"专业
:"
prop=
"specialty"
class=
"ec-clear-left is-required
"
>
<el-form-item
label=
"专业
"
prop=
"specialty"
class=
"ec-clear-left
"
>
<el-input
<el-input
class=
"ec-input-normal"
class=
"ec-input-normal"
size=
"mini"
size=
"mini"
v-model
.
trim=
"model.specialty"
>
v-model
.
trim=
"model.specialty"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"学历
:"
prop=
"education"
class=
"ec-clear-left is-required
"
>
<el-form-item
label=
"学历
"
prop=
"education"
class=
"ec-clear-left
"
>
<el-input
<el-input
size=
"mini"
size=
"mini"
class=
"ec-input-normal"
class=
"ec-input-normal"
v-model
.
trim=
"model.education"
>
v-model
.
trim=
"model.education"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"用户角色
:"
prop=
"userRoles"
class=
"ec-clear-left is-require
d"
>
<el-form-item
label=
"用户角色
"
prop=
"userRoles"
class=
"ec-clear-left is-required-en
d"
>
<el-checkbox-group
v-model=
"model.userRoles"
>
<el-checkbox-group
v-model=
"model.userRoles"
>
<el-checkbox
v-for=
"sItem in accountUserRoles"
:key=
"sItem.name"
:label=
"sItem.key"
>
{{
sItem
.
name
}}
</el-checkbox>
<el-checkbox
v-for=
"sItem in accountUserRoles"
:key=
"sItem.name"
:label=
"sItem.key"
>
{{
sItem
.
name
}}
</el-checkbox>
</el-checkbox-group>
</el-checkbox-group>
...
...
src/components/account_list/accountHome.vue
View file @
c6342626
...
@@ -264,7 +264,7 @@ export default {
...
@@ -264,7 +264,7 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
requestAPI
(
api
[
`delete
${
this
.
type
}
`
],
{
id
})
requestAPI
(
api
[
`delete
account
`
],
{
id
})
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
this
.
$message
.
success
(
`
${
deleteTip
}
成功`
)
this
.
$message
.
success
(
`
${
deleteTip
}
成功`
)
this
.
_reload
()
this
.
_reload
()
...
...
src/components/case/caseModal.vue
View file @
c6342626
...
@@ -70,7 +70,7 @@ export default {
...
@@ -70,7 +70,7 @@ export default {
save
()
{
save
()
{
let
_params
=
Object
.
assign
({},
setModule
(
this
.
model
,
'Documents'
))
let
_params
=
Object
.
assign
({},
setModule
(
this
.
model
,
'Documents'
))
let
_apiUrl
=
!
this
.
model
.
id
?
api
.
save
DocNew
:
api
.
saveDoc
Edit
let
_apiUrl
=
!
this
.
model
.
id
?
api
.
save
CaseNew
:
api
.
saveCase
Edit
!
this
.
model
.
id
&&
delete
_params
[
'Documents[id]'
]
!
this
.
model
.
id
&&
delete
_params
[
'Documents[id]'
]
this
.
$refs
[
'form'
].
_validate
(()
=>
{
this
.
$refs
[
'form'
].
_validate
(()
=>
{
requestAPI
(
Object
.
assign
(
_apiUrl
,
{
method
:
'POST'
}),
_params
)
requestAPI
(
Object
.
assign
(
_apiUrl
,
{
method
:
'POST'
}),
_params
)
...
...
src/components/case_list/caseItem.vue
View file @
c6342626
...
@@ -83,11 +83,11 @@
...
@@ -83,11 +83,11 @@
<el-col
:span=
"6"
:xs=
"24"
>
<el-col
:span=
"6"
:xs=
"24"
>
<span
class=
"obear-schedule-right__content border-dc3545"
>
Case说明
</span><span>
:
{{
item
.
description
}}
</span>
<span
class=
"obear-schedule-right__content border-dc3545"
>
Case说明
</span><span>
:
{{
item
.
description
}}
</span>
</el-col>
</el-col>
<el-col
:span=
"
6
"
:xs=
"24"
>
<el-col
:span=
"
2
"
:xs=
"24"
>
</el-col>
</el-col>
<el-col
:span=
"
3
"
:xs=
"24"
>
<el-col
:span=
"
2
"
:xs=
"24"
>
</el-col>
</el-col>
<el-col
:span=
"
9"
:xs=
"24
"
>
<el-col
:span=
"
14"
:xs=
"24"
style=
"text-align: right;
"
>
<slot
name=
"opearate"
>
<slot
name=
"opearate"
>
</slot>
</slot>
</el-col>
</el-col>
...
...
src/components/common/scheduleItem.vue
View file @
c6342626
...
@@ -55,9 +55,9 @@
...
@@ -55,9 +55,9 @@
<el-col
:span=
"6"
:xs=
"24"
>
<el-col
:span=
"6"
:xs=
"24"
>
<span
class=
"obear-schedule-right__content"
>
情况说明
</span><span>
:
{{
item
.
complete_description
}}
</span>
<span
class=
"obear-schedule-right__content"
>
情况说明
</span><span>
:
{{
item
.
complete_description
}}
</span>
</el-col>
</el-col>
<el-col
:span=
"
6
"
:xs=
"24"
>
<el-col
:span=
"
2
"
:xs=
"24"
>
</el-col>
</el-col>
<el-col
:span=
"
6"
:xs=
"24
"
>
<el-col
:span=
"
10"
:xs=
"24"
style=
"text-align: right
"
>
<slot
name=
"opearate"
>
<slot
name=
"opearate"
>
</slot>
</slot>
</el-col>
</el-col>
...
...
src/components/schedule/scheduleForm.vue
View file @
c6342626
<
template
>
<
template
>
<section
class=
"ec-page-wrapper"
style=
"overflow: hidden; padding-bottom: 0px;"
>
<section
class=
"ec-page-wrapper"
style=
"overflow: hidden; padding-bottom: 0px;"
>
<el-form
label-width=
"1
2
0px"
ref=
"form"
:rules=
"rules"
:model=
"model"
class=
"ec-create-form"
>
<el-form
label-width=
"1
4
0px"
ref=
"form"
:rules=
"rules"
:model=
"model"
class=
"ec-create-form"
>
<el-form-item
label=
"客户名称"
prop=
"actName"
class=
"ec-clear-left"
v-if=
"isCreate"
>
<el-form-item
label=
"客户名称"
prop=
"actName"
class=
"ec-clear-left"
v-if=
"isCreate"
>
<dep-select
<dep-select
:query=
"model"
:query=
"model"
:inputWidth=
"340"
:inputWidth=
"340"
:startLoadInitial=
"false"
/>
:startLoadInitial=
"false"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"待办事项内容"
prop=
"schedule_title"
class=
"ec-clear-left ec-form-item-lg is-required fontWhite"
>
<el-form-item
label=
"待办事项内容"
prop=
"schedule_title"
class=
"ec-clear-left ec-form-item-lg is-required
-end
fontWhite"
>
<el-input
<el-input
class=
"ec-input-normal"
class=
"ec-input-normal"
type=
"textarea"
type=
"textarea"
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
</el-input>
</el-input>
<span
class=
"tips"
>
待办事项内容不能为空
</span>
<span
class=
"tips"
>
待办事项内容不能为空
</span>
</el-form-item>
</el-form-item>
<el-form-item
label=
"待办时间"
prop=
"time_type"
class=
"ec-clear-left"
>
<el-form-item
label=
"待办时间"
prop=
"time_type"
class=
"ec-clear-left
is-required-end
"
>
<el-select
v-model=
"model.time_type"
placeholder=
"请选择"
size=
"small"
>
<el-select
v-model=
"model.time_type"
placeholder=
"请选择"
size=
"small"
>
<el-option
<el-option
v-for=
"item in timeTypeArray"
v-for=
"item in timeTypeArray"
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"负责人"
prop=
"created_by"
class=
"ec-clear-left"
>
<el-form-item
label=
"负责人"
prop=
"created_by"
class=
"ec-clear-left
is-required-end
"
>
<el-select
v-model=
"model.created_by"
placeholder=
"请选择"
size=
"small"
>
<el-select
v-model=
"model.created_by"
placeholder=
"请选择"
size=
"small"
>
<el-option
<el-option
v-for=
"item in createdByArray"
v-for=
"item in createdByArray"
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"是否共享"
prop=
"is_public"
class=
"ec-clear-left"
>
<el-form-item
label=
"是否共享"
prop=
"is_public"
class=
"ec-clear-left
is-required-end
"
>
<single-radio
<single-radio
:form-item=
"model.is_public"
:form-item=
"model.is_public"
:options-list=
"is_public_array"
:options-list=
"is_public_array"
...
...
src/components/service_list/serviceHome.vue
View file @
c6342626
...
@@ -186,7 +186,7 @@ export default {
...
@@ -186,7 +186,7 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
requestAPI
(
api
[
`delete
${
this
.
type
}
`
],
{
id
})
requestAPI
(
api
[
`delete
service
`
],
{
id
})
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
this
.
$message
.
success
(
`
${
deleteTip
}
成功`
)
this
.
$message
.
success
(
`
${
deleteTip
}
成功`
)
this
.
_reload
()
this
.
_reload
()
...
...
src/components/service_list/serviceItem.vue
View file @
c6342626
...
@@ -61,7 +61,7 @@ export default {
...
@@ -61,7 +61,7 @@ export default {
},
},
deleteEvent
(
item
)
{
deleteEvent
(
item
)
{
this
.
$parent
.
deleteEvent
(
item
)
this
.
$parent
.
deleteEvent
(
item
.
id
)
}
}
}
}
}
}
...
...
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