Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
NewTruckTerminalSyetem
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
SQL_Mou
NewTruckTerminalSyetem
Commits
04164bcd
Commit
04164bcd
authored
Nov 23, 2022
by
xxx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除订单接口添加odd
parent
2935e2ec
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
13 deletions
+29
-13
index.vue
src/views/MLargeScreen/components/personalCenter/index.vue
+2
-2
index.vue
...ews/MLargeScreen/components/startOrderReceiving/index.vue
+24
-8
index.vue
src/views/MLargeScreen/index.vue
+3
-3
No files found.
src/views/MLargeScreen/components/personalCenter/index.vue
View file @
04164bcd
...
...
@@ -159,7 +159,7 @@ export default {
//删除调度单子
httpGet
(
dingDanBiaoCaoZuo
,{
carNo
:
this
.
carnumber
}).
then
((
res3Del
)
=>
{
if
(
res3Del
.
code
==
200
&&
res3Del
.
data
.
content
.
length
!=
0
){
httpDelForJson
(
dingDanBiaoCaoZuo
,[
res3Del
.
data
.
content
[
0
].
id
,
this
.
carnumber
]).
then
((
res3DelSon
)
=>
{
httpDelForJson
(
dingDanBiaoCaoZuo
,[
res3Del
.
data
.
content
[
0
].
id
,
this
.
carnumber
,
res3Del
.
data
.
content
[
0
].
odd
]).
then
((
res3DelSon
)
=>
{
this
.
logout
();
});
}
else
{
...
...
@@ -259,7 +259,7 @@ export default {
//删除调度单子
httpGet
(
dingDanBiaoCaoZuo
,{
carNo
:
this
.
carnumber
}).
then
((
res3Del
)
=>
{
if
(
res3Del
.
code
==
200
&&
res3Del
.
data
.
content
.
length
!=
0
){
httpDelForJson
(
dingDanBiaoCaoZuo
,[
res3Del
.
data
.
content
[
0
].
id
,
this
.
carnumber
]).
then
((
res3DelSon
)
=>
{});
httpDelForJson
(
dingDanBiaoCaoZuo
,[
res3Del
.
data
.
content
[
0
].
id
,
this
.
carnumber
,
res3Del
.
data
.
content
[
0
].
odd
]).
then
((
res3DelSon
)
=>
{});
}
})
}
...
...
src/views/MLargeScreen/components/startOrderReceiving/index.vue
View file @
04164bcd
...
...
@@ -44,7 +44,8 @@ export default {
btnShow4
:
false
,
//导航显示开关
sonTimer1
:
null
,
startOrderSrcUrl
:
''
,
//来订单语音路径
dingDanId
:
''
,
dingDanId
:
''
,
//订单id
dingdanodd
:
''
,
//订单odd
zuizhongdingdanid
:
''
,
equipmentName
:
''
,
//车载设备编号
xiecheBtnAble
:
false
,
//卸车按钮是否能用
...
...
@@ -89,6 +90,7 @@ export default {
this
.
showDe
=
true
;
this
.
carDestination
=
res_1
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res_1
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res_1
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
this
.
paidanFlag
=
res_1
.
data
.
content
[
0
].
flag
;
this
.
btnShow4
=
true
;
...
...
@@ -107,6 +109,7 @@ export default {
this
.
btnShow4
=
false
;
this
.
carDestination
=
res_1
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res_1
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res_1
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
this
.
orderClass
=
'
装车
'
;
//启动语音
...
...
@@ -127,6 +130,7 @@ export default {
this
.
btnShow4
=
true
;
this
.
carDestination
=
res_1
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res_1
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res_1
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
this
.
orderClass
=
'
卸车
'
;
this
.
xiecheyuyinTimer
=
this
.
xiecheyuyinTimer
+
1
;
...
...
@@ -166,7 +170,7 @@ export default {
httpGet
(
dingDanBiaoCaoZuo
,{
sort
:
'
createTime,desc
'
,
carNo
:
this
.
carnumber
,
flag
:
0
}).
then
((
resDel
)
=>
{
if
(
resDel
.
code
==
200
){
resDel
.
data
.
content
.
forEach
((
itemDel
,
indexDel
)
=>
{
httpDelForJson
(
dingDanBiaoCaoZuo
,[
itemDel
.
id
,
this
.
carnumber
]).
then
((
resDelSon
)
=>
{});
httpDelForJson
(
dingDanBiaoCaoZuo
,[
itemDel
.
id
,
this
.
carnumber
,
item
.
odd
]).
then
((
resDelSon
)
=>
{});
})
}
})
...
...
@@ -176,6 +180,7 @@ export default {
this
.
showDe
=
true
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
this
.
btnShow3
=
true
;
this
.
btnShow4
=
true
;
...
...
@@ -188,6 +193,7 @@ export default {
this
.
btnShow4
=
false
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
//启动语音
this
.
startOrderSrcUrl
=
newOrder
;
...
...
@@ -210,6 +216,7 @@ export default {
this
.
btnShow4
=
false
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
//启动语音
this
.
startOrderSrcUrl
=
newOrder
;
...
...
@@ -226,6 +233,7 @@ export default {
this
.
btnShow4
=
false
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
//启动语音
this
.
startOrderSrcUrl
=
newOrder
;
...
...
@@ -275,7 +283,7 @@ export default {
httpGet
(
dingDanBiaoCaoZuo
,{
sort
:
'
createTime,desc
'
,
carNo
:
this
.
carnumber
,
flag
:
0
}).
then
((
resDel
)
=>
{
if
(
resDel
.
code
==
200
){
resDel
.
data
.
content
.
forEach
((
itemDel
,
indexDel
)
=>
{
httpDelForJson
(
dingDanBiaoCaoZuo
,[
itemDel
.
id
,
this
.
carnumber
]).
then
((
resDelSon
)
=>
{});
httpDelForJson
(
dingDanBiaoCaoZuo
,[
itemDel
.
id
,
this
.
carnumber
,
item
.
odd
]).
then
((
resDelSon
)
=>
{});
})
}
})
...
...
@@ -285,6 +293,7 @@ export default {
this
.
showDe
=
true
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
this
.
btnShow3
=
true
;
this
.
btnShow4
=
true
;
...
...
@@ -297,6 +306,7 @@ export default {
this
.
btnShow4
=
false
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
//启动语音
this
.
startOrderSrcUrl
=
newOrder
;
...
...
@@ -319,6 +329,7 @@ export default {
this
.
btnShow4
=
false
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
//启动语音
this
.
startOrderSrcUrl
=
newOrder
;
...
...
@@ -335,6 +346,7 @@ export default {
this
.
btnShow4
=
false
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
//启动语音
this
.
startOrderSrcUrl
=
newOrder
;
...
...
@@ -401,6 +413,7 @@ export default {
this
.
btnShow3
=
false
;
this
.
carDestination
=
res_1
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res_1
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res_1
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
this
.
orderClass
=
'
装车
'
;
}
else
{
...
...
@@ -410,6 +423,7 @@ export default {
this
.
btnShow3
=
false
;
this
.
carDestination
=
res_1
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res_1
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res_1
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
this
.
orderClass
=
'
卸车
'
;
}
...
...
@@ -440,7 +454,7 @@ export default {
httpGet
(
dingDanBiaoCaoZuo
,{
sort
:
'
createTime,desc
'
,
carNo
:
this
.
carnumber
,
flag
:
0
}).
then
((
resDel
)
=>
{
if
(
resDel
.
code
==
200
){
resDel
.
data
.
content
.
forEach
((
itemDel
,
indexDel
)
=>
{
httpDelForJson
(
dingDanBiaoCaoZuo
,[
itemDel
.
id
,
this
.
carnumber
]).
then
((
resDelSon
)
=>
{});
httpDelForJson
(
dingDanBiaoCaoZuo
,[
itemDel
.
id
,
this
.
carnumber
,
item
.
odd
]).
then
((
resDelSon
)
=>
{});
})
}
})
...
...
@@ -455,6 +469,7 @@ export default {
this
.
btnShow3
=
false
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
}
//获取车辆坐标计算距离并返回给后台
...
...
@@ -490,7 +505,7 @@ export default {
httpGet
(
dingDanBiaoCaoZuo
,{
sort
:
'
createTime,desc
'
,
carNo
:
this
.
carnumber
,
flag
:
0
}).
then
((
resDel
)
=>
{
if
(
resDel
.
code
==
200
){
resDel
.
data
.
content
.
forEach
((
itemDel
,
indexDel
)
=>
{
httpDelForJson
(
dingDanBiaoCaoZuo
,[
itemDel
.
id
,
this
.
carnumber
]).
then
((
resDelSon
)
=>
{});
httpDelForJson
(
dingDanBiaoCaoZuo
,[
itemDel
.
id
,
this
.
carnumber
,
item
.
odd
]).
then
((
resDelSon
)
=>
{});
})
}
})
...
...
@@ -505,6 +520,7 @@ export default {
this
.
btnShow3
=
false
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
this
.
dingdanodd
=
res
.
data
.
content
[
0
].
odd
;
this
.
equipmentName
=
resSon1
.
data
.
content
[
0
].
equipmentName
;
}
//获取车辆坐标计算距离并返回给后台
...
...
@@ -621,7 +637,7 @@ export default {
}
}
});
httpDelForJson
(
dingDanBiaoCaoZuo
,[
this
.
dingDanId
,
this
.
carnumber
]).
then
((
res
)
=>
{});
httpDelForJson
(
dingDanBiaoCaoZuo
,[
this
.
dingDanId
,
this
.
carnumber
,
this
.
dingdanodd
]).
then
((
res
)
=>
{});
this
.
$nextTick
(()
=>
{
this
.
oldxy
.
lat
=
0
;
this
.
oldxy
.
lng
=
0
;
...
...
@@ -676,7 +692,7 @@ export default {
}
}
});
httpDelForJson
(
dingDanBiaoCaoZuo
,[
this
.
dingDanId
,
this
.
carnumber
]).
then
((
res
)
=>
{
httpDelForJson
(
dingDanBiaoCaoZuo
,[
this
.
dingDanId
,
this
.
carnumber
,
this
.
dingdanodd
]).
then
((
res
)
=>
{
this
.
$parent
.
zhixinglujing
(
false
,
this
.
carnumber
,
this
.
carDestination
);
});
})
...
...
@@ -746,7 +762,7 @@ export default {
}
}
});
httpDelForJson
(
dingDanBiaoCaoZuo
,[
this
.
dingDanId
,
this
.
carnumber
]).
then
((
res
)
=>
{
httpDelForJson
(
dingDanBiaoCaoZuo
,[
this
.
dingDanId
,
this
.
carnumber
,
this
.
dingdanodd
]).
then
((
res
)
=>
{
this
.
$parent
.
zhixinglujing
(
false
,
this
.
carnumber
,
this
.
carDestination
);
});
})
...
...
src/views/MLargeScreen/index.vue
View file @
04164bcd
...
...
@@ -73,7 +73,7 @@
<div
class=
"waitingtrucksView_content"
>
<div
v-for=
"(item,index) in daizhangCar"
:key=
"index"
>
<div>
车牌号:
{{
item
.
number
}}
</div>
<button
class=
"daizhangCarBtn1"
:disabled=
"interdictBtn || (item.weightStatus != 2)"
@
click=
"wanchengzhuangcheFn(item.number,item.id)"
>
完成装车
</button>
<button
class=
"daizhangCarBtn1"
:disabled=
"interdictBtn || (item.weightStatus != 2)"
@
click=
"wanchengzhuangcheFn(item.number,item.id
,item.odd
)"
>
完成装车
</button>
</div>
</div>
</div>
...
...
@@ -491,7 +491,7 @@ export default {
}
},
//完成装车
wanchengzhuangcheFn
(
number
,
id
){
wanchengzhuangcheFn
(
number
,
id
,
odd
){
this
.
interdictBtn
=
true
;
//改订单状态
httpGet
(
manualSchedulingQuery
,{
sort
:
'
createTime,desc
'
,
size
:
1
,
carNo
:
number
}).
then
((
res
)
=>
{
...
...
@@ -527,7 +527,7 @@ export default {
if
(
res
.
code
==
200
){}
});
//删除
httpDelForJson
(
dingDanBiaoCaoZuo
,[
id
,
this
.
carnumber
]).
then
((
res
)
=>
{
httpDelForJson
(
dingDanBiaoCaoZuo
,[
id
,
this
.
carnumber
,
odd
]).
then
((
res
)
=>
{
this
.
loadData1
();
});
},
...
...
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