Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform-ui
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform-ui
Commits
bd5a94e1
Commit
bd5a94e1
authored
Sep 26, 2019
by
guoyou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复
parent
e0ac9fd3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
48 additions
and
153 deletions
+48
-153
vehiclePlanModal.vue
src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue
+48
-153
No files found.
src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue
View file @
bd5a94e1
<!--车辆排班 保养弹框-->
<!--车辆排班 保养弹框-->
<
template
>
<
template
>
<el-dialog
title=
"安排用车"
:visible
.
sync=
"anpai"
class=
"user-car"
>
<el-dialog
title=
"安排用车"
:visible
.
sync=
"anpai"
class=
"user-car"
>
<el-form
:model=
"form"
ref=
"form"
:rules=
"rules"
label-width=
"140px"
>
<el-form
:model=
"form"
ref=
"form"
:rules=
"rules"
label-width=
"140px"
>
<el-form-item
label=
"车牌号"
>
<el-form-item
label=
"车牌号"
>
<span>
{{
currentItem
.
item
.
numberPlate
}}
</span>
<span>
{{
currentItem
.
item
.
numberPlate
}}
</span>
</el-form-item>
</el-form-item>
...
@@ -29,23 +29,14 @@
...
@@ -29,23 +29,14 @@
<span
v-if=
"currentItem.item.vehicleModel.keyword"
>
{{
currentItem
.
item
.
vehicleModel
.
keyword
}}
</span>
<span
v-if=
"currentItem.item.vehicleModel.keyword"
>
{{
currentItem
.
item
.
vehicleModel
.
keyword
}}
</span>
</el-form-item>
</el-form-item>
<el-form-item
label=
"选择时间"
prop=
"times"
>
<el-form-item
label=
"选择时间"
prop=
"times"
>
<
!--
<
el-date-picker
<el-date-picker
v-model=
"form.times"
v-model=
"form.times"
type=
"datetimerange"
type=
"datetimerange"
:picker-options=
"pickerOptions0"
:picker-options=
"pickerOptions0"
format=
"yyyy-MM-dd HH:00:00"
format=
"yyyy-MM-dd HH:00:00"
value-format=
"yyyy-MM-dd HH:00:00"
value-format=
"yyyy-MM-dd HH:00:00"
placeholder=
"选择时间范围"
placeholder=
"选择时间范围"
>
></el-date-picker>
-->
</el-date-picker>
<el-time-picker
is-range
v-model=
"form.times"
range-separator=
"-"
start-placeholder=
"开始时间"
end-placeholder=
"结束时间"
placeholder=
"选择时间范围"
value-format=
"HH-mm-ss"
></el-time-picker>
</el-form-item>
</el-form-item>
<el-form-item
label=
"还车分公司"
prop=
"arrivalBranchCompanyName"
>
<el-form-item
label=
"还车分公司"
prop=
"arrivalBranchCompanyName"
>
<el-autocomplete
<el-autocomplete
...
@@ -68,8 +59,9 @@
...
@@ -68,8 +59,9 @@
<el-option
label=
"客户用车"
value=
"9"
></el-option>
<el-option
label=
"客户用车"
value=
"9"
></el-option>
<el-option
label=
"其他"
value=
"10"
></el-option>
<el-option
label=
"其他"
value=
"10"
></el-option>
<!--
<el-option
v-for=
"item in getAllUseType() "
:key=
"item.code"
:label=
"item.val"
--
>
<!--
<el-option
v-for=
"item in getAllUseType() "
:key=
"item.code"
:label=
"item.val"
--
>
<!--:value="item.code">
</el-option>
-->
<!--:value="item.code">
</el-option>
-->
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"保养项目"
prop=
"upkeepIds"
v-if=
"form.bookType==6"
>
<el-form-item
label=
"保养项目"
prop=
"upkeepIds"
v-if=
"form.bookType==6"
>
...
@@ -80,29 +72,14 @@
...
@@ -80,29 +72,14 @@
<el-form-item
label=
"路线"
v-if=
"form.bookType==5"
required
>
<el-form-item
label=
"路线"
v-if=
"form.bookType==5"
required
>
<el-select
class=
"filter-item"
placeholder=
"请选择路线"
v-model=
"goodId"
@
change=
"goodChange"
>
<el-select
class=
"filter-item"
placeholder=
"请选择路线"
v-model=
"goodId"
@
change=
"goodChange"
>
<el-option
:key=
"undefined"
label=
"无"
:value=
"undefined"
></el-option>
<el-option
:key=
"undefined"
label=
"无"
:value=
"undefined"
></el-option>
<el-option
<el-option
v-for=
"item in goodList"
:key=
"item.goodId"
:label=
"item.goodName"
:value=
"item.goodId"
></el-option>
v-for=
"item in goodList"
:key=
"item.goodId"
:label=
"item.goodName"
:value=
"item.goodId"
></el-option>
</el-select>
</el-select>
<el-select
class=
"filter-item"
placeholder=
"请选择出车公司"
v-model=
"siteId"
@
change=
"siteChange"
>
<el-select
class=
"filter-item"
placeholder=
"请选择出车公司"
v-model=
"siteId"
@
change=
"siteChange"
>
<el-option
:key=
"undefined"
label=
"无"
:value=
"undefined"
></el-option>
<el-option
:key=
"undefined"
label=
"无"
:value=
"undefined"
></el-option>
<el-option
<el-option
v-for=
"item in siteList"
:key=
"item.siteId"
:label=
"item.siteName"
:value=
"item.siteId"
></el-option>
v-for=
"item in siteList"
:key=
"item.siteId"
:label=
"item.siteName"
:value=
"item.siteId"
></el-option>
</el-select>
</el-select>
<el-select
class=
"filter-item"
placeholder=
"请选择出发时间"
v-model=
"verificationId"
>
<el-select
class=
"filter-item"
placeholder=
"请选择出发时间"
v-model=
"verificationId"
>
<el-option
<el-option
v-for=
"item in timeList"
:key=
"item.verificationId"
:label=
"item.time"
:value=
"item.verificationId"
></el-option>
v-for=
"item in timeList"
:key=
"item.verificationId"
:label=
"item.time"
:value=
"item.verificationId"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"使用人"
prop=
"vehicleUsername"
>
<el-form-item
label=
"使用人"
prop=
"vehicleUsername"
>
...
@@ -117,18 +94,14 @@
...
@@ -117,18 +94,14 @@
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancel()"
>
取消
</el-button>
<el-button
@
click=
"cancel()"
>
取消
</el-button>
<el-button
<el-button
type=
"primary"
@
click=
"handelOk('form')"
v-if=
"vehicleSchedulManage_btn_add_plan"
>
确 定
</el-button>
type=
"primary"
@
click=
"handelOk('form')"
v-if=
"vehicleSchedulManage_btn_add_plan"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
</
template
>
</
template
>
<
style
>
<
style
>
.user-car
.el-row
{
.user-car
.el-row
{
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
</
style
>
</
style
>
<
script
>
<
script
>
import
{
mapGetters
}
from
'vuex'
;
import
{
mapGetters
}
from
'vuex'
;
...
@@ -173,7 +146,13 @@
...
@@ -173,7 +146,13 @@
if
(
!
value
)
{
if
(
!
value
)
{
return
callback
(
new
Error
(
'手机号不能为空'
));
return
callback
(
new
Error
(
'手机号不能为空'
));
}
else
{
}
else
{
return
callback
(
new
Error
(
"请输入正确的手机号"
));
const
reg
=
/^
[
1
](([
3
][
0-9
])
|
([
4
][
5,7,9
])
|
([
5
][
0-9
])
|
([
6
][
6
])
|
([
7
][
1,2,3,5,6,7,8
])
|
([
8
][
0-9
])
|
([
9
][
1,8,9
]))[
0-9
]{8}
$/
console
.
log
(
reg
.
test
(
value
));
if
(
reg
.
test
(
value
))
{
callback
();
}
else
{
return
callback
(
new
Error
(
'请输入正确的手机号'
));
}
}
}
};
};
return
{
return
{
...
@@ -226,83 +205,26 @@
...
@@ -226,83 +205,26 @@
bookType
:{
bookType
:{
type
:
'string'
,
type
:
'string'
,
required
:
true
,
required
:
true
,
message
:
"请输入使用人姓名"
,
message
:
'请选择用途'
,
trigger
:
"blur"
trigger
:
'change'
},
},
{
times
:
{
min
:
0
,
required
:
true
,
max
:
20
,
message
:
'请选择时间'
,
message
:
"长度小于 20 个字符"
,
trigger
:
"blur"
}
}
],
arrivalBranchCompanyName
:
{
type
:
"string"
,
required
:
true
,
message
:
"请选择还车公司"
,
trigger
:
"change"
},
},
vehicleUserPhone
:
{
vehicleSchedulManage_btn_add_plan
:
false
,
//申请预定
validator
:
checkPhone
,
trigger
:
"blur"
,
required
:
true
},
bookType
:
{
type
:
"string"
,
required
:
true
,
message
:
"请选择用途"
,
trigger
:
"change"
},
times
:
{
required
:
true
,
message
:
"请选择时间"
}
},
vehicleSchedulManage_btn_add_plan
:
false
//申请预定
};
},
created
()
{
console
.
log
(
this
.
currentItem
);
this
.
vehicleSchedulManage_btn_add_plan
=
this
.
elements
[
"vehicleSchedulManage:btn_add_plan"
];
getAll
().
then
(
response
=>
{
this
.
allCompaniesArr
=
response
.
data
;
});
getAllCompany
(
codeAndBranchCompany
=>
{
this
.
allCompanies
=
codeAndBranchCompany
;
});
getUpkeepAll
().
then
(
response
=>
{
this
.
upkeepList
=
response
.
data
;
});
},
computed
:
{
...
mapGetters
([
"elements"
])
},
watch
:
{
anpai
(
newValue
,
oldValue
)
{
if
(
!
newValue
)
{
this
.
$emit
(
"anpaiDialogEvent"
,
false
);
}
}
}
},
mounted
()
{
this
.
anpai
=
true
;
},
methods
:
{
/**
* 还车分公司
*/
handleSelectArrivalCompanyName
(
item
)
{
this
.
form
.
arrivalBranchCompanyId
=
item
.
id
;
this
.
form
.
arrivalBranchCompanyName
=
item
.
name
;
console
.
log
(
item
);
},
},
querySearch
(
queryString
,
cb
)
{
created
()
{
let
selectArry
=
[];
console
.
log
(
this
.
currentItem
);
this
.
allCompaniesArr
.
map
(
function
(
item
)
{
this
.
vehicleSchedulManage_btn_add_plan
=
this
.
elements
[
'vehicleSchedulManage:btn_add_plan'
];
item
.
value
=
item
.
name
;
getAll
()
selectArry
.
push
(
item
);
.
then
(
response
=>
{
this
.
allCompaniesArr
=
response
.
data
;
})
getAllCompany
(
codeAndBranchCompany
=>
{
this
.
allCompanies
=
codeAndBranchCompany
;
});
});
getUpkeepAll
().
then
(
response
=>
{
getUpkeepAll
().
then
(
response
=>
{
this
.
upkeepList
=
response
.
data
this
.
upkeepList
=
response
.
data
...
@@ -316,16 +238,15 @@
...
@@ -316,16 +238,15 @@
'elements'
,
'elements'
,
]),
]),
},
},
createFilter
(
queryString
)
{
watch
:
{
return
restaurant
=>
{
anpai
(
newValue
,
oldValue
){
return
restaurant
.
name
.
indexOf
(
queryString
.
toLowerCase
())
!=
-
1
;
if
(
!
newValue
){
};
this
.
$emit
(
"anpaiDialogEvent"
,
false
);
}
},
},
},
/**
mounted
()
{
* 弹框-取消
this
.
anpai
=
true
;
* */
cancel
()
{
this
.
$emit
(
"anpaiDialogEvent"
,
false
);
},
},
methods
:
{
methods
:
{
goodChange
(){
goodChange
(){
...
@@ -428,35 +349,9 @@
...
@@ -428,35 +349,9 @@
}
}
})
})
}
}
let
params
=
{
})
vehicleId
:
this
.
currentItem
.
item
.
id
,
},
bookStartDate
:
formatDate
(
this
.
form
.
times
[
0
],
"hh:mm:ss"
),
//预定开始时间
bookEndDate
:
formatDate
(
this
.
form
.
times
[
1
],
"hh:mm:ss"
),
//预定结束时间
retCompany
:
this
.
form
.
arrivalBranchCompanyId
,
//还车分公司
bookType
:
this
.
form
.
bookType
,
//预定车辆用途类型
vehicleUsername
:
this
.
form
.
vehicleUsername
,
//使用人姓名
vehicleUserPhone
:
this
.
form
.
vehicleUserPhone
,
//使用人电话
remark
:
this
.
form
.
remark
,
//说明
upkeepIds
:
this
.
form
.
bookType
==
6
?
this
.
form
.
upkeepIds
.
join
(
","
)
:
""
//保养类型
};
bookPlan
(
params
).
then
(
response
=>
{
if
(
response
.
status
===
200
)
{
this
.
$emit
(
"anpaiDialogEvent"
,
true
);
}
else
{
this
.
$notify
({
title
:
"失败"
,
message
:
response
.
message
,
type
:
"error"
,
duration
:
2000
});
}
});
}
});
}
}
}
}
};
</
script
>
</
script
>
\ No newline at end of file
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