Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
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
lanbaoming
jiedao-app-operator-master
Commits
86f87958
Commit
86f87958
authored
Nov 25, 2024
by
zs嵩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
强制到仓,修改到仓记录提交后,关闭页面
parent
a9036d1a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
65 additions
and
52 deletions
+65
-52
index.vue
src/layout/components/TagsView/index.vue
+36
-47
startUnloading.vue
...ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
+2
-5
Warehouse.vue
src/views/ecw/order/warehousingTo/components/Warehouse.vue
+27
-0
No files found.
src/layout/components/TagsView/index.vue
View file @
86f87958
<
template
>
<
template
>
<div
id=
"tags-view-container"
class=
"tags-view-container"
>
<div
id=
"tags-view-container"
class=
"tags-view-container"
>
<scroll-pane
ref=
"scrollPane"
class=
"tags-view-wrapper"
@
scroll=
"handleScroll"
>
<scroll-pane
ref=
"scrollPane"
class=
"tags-view-wrapper"
@
scroll=
"handleScroll"
>
<router-link
<router-link
v-for=
"tag in visitedViews"
ref=
"tag"
:key=
"tag.path"
:class=
"isActive(tag) ? 'active' : ''"
:to=
"
{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item" :style="activeStyle(tag)" @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''" @contextmenu.prevent.native="openMenu(tag, $event)">
v-for=
"tag in visitedViews"
{{
$l
(
tag
.
meta
,
"
title
"
)
}}
ref=
"tag"
:key=
"tag.path"
:class=
"isActive(tag)?'active':''"
:to=
"
{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
tag="span"
class="tags-view-item"
:style="activeStyle(tag)"
@click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
@contextmenu.prevent.native="openMenu(tag,$event)"
>
{{
$l
(
tag
.
meta
,
'
title
'
)
}}
<span
v-if=
"!isAffix(tag)"
class=
"el-icon-close"
@
click.prevent.stop=
"closeSelectedTag(tag)"
/>
<span
v-if=
"!isAffix(tag)"
class=
"el-icon-close"
@
click.prevent.stop=
"closeSelectedTag(tag)"
/>
</router-link>
</router-link>
</scroll-pane>
</scroll-pane>
<ul
v-show=
"visible"
:style=
"
{
left:left+'px',top:top+'px'
}" class="contextmenu">
<ul
v-show=
"visible"
:style=
"
{
left: left + 'px', top: top + 'px'
}" class="contextmenu">
<li
@
click=
"refreshSelectedTag(selectedTag)"
><i
class=
"el-icon-refresh-right"
></i>
刷新页面
</li>
<li
@
click=
"refreshSelectedTag(selectedTag)"
><i
class=
"el-icon-refresh-right"
></i>
刷新页面
</li>
<li
v-if=
"!isAffix(selectedTag)"
@
click=
"closeSelectedTag(selectedTag)"
><i
class=
"el-icon-close"
></i>
关闭当前
</li>
<li
v-if=
"!isAffix(selectedTag)"
@
click=
"closeSelectedTag(selectedTag)"
><i
class=
"el-icon-close"
></i>
关闭当前
</li>
<li
@
click=
"closeOthersTags"
><i
class=
"el-icon-circle-close"
></i>
关闭其他
</li>
<li
@
click=
"closeOthersTags"
><i
class=
"el-icon-circle-close"
></i>
关闭其他
</li>
...
@@ -29,8 +18,8 @@
...
@@ -29,8 +18,8 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
ScrollPane
from
'
./ScrollPane
'
import
ScrollPane
from
"
./ScrollPane
"
import
path
from
'
path
'
import
path
from
"
path
"
export
default
{
export
default
{
components
:
{
ScrollPane
},
components
:
{
ScrollPane
},
...
@@ -51,7 +40,7 @@ export default {
...
@@ -51,7 +40,7 @@ export default {
return
this
.
$store
.
state
.
permission
.
routes
return
this
.
$store
.
state
.
permission
.
routes
},
},
theme
()
{
theme
()
{
return
this
.
$store
.
state
.
settings
.
theme
;
return
this
.
$store
.
state
.
settings
.
theme
}
}
},
},
watch
:
{
watch
:
{
...
@@ -62,9 +51,9 @@ export default {
...
@@ -62,9 +51,9 @@ export default {
},
},
visible
(
value
)
{
visible
(
value
)
{
if
(
value
)
{
if
(
value
)
{
document
.
body
.
addEventListener
(
'
click
'
,
this
.
closeMenu
)
document
.
body
.
addEventListener
(
"
click
"
,
this
.
closeMenu
)
}
else
{
}
else
{
document
.
body
.
removeEventListener
(
'
click
'
,
this
.
closeMenu
)
document
.
body
.
removeEventListener
(
"
click
"
,
this
.
closeMenu
)
}
}
}
}
},
},
...
@@ -77,18 +66,18 @@ export default {
...
@@ -77,18 +66,18 @@ export default {
return
route
.
path
===
this
.
$route
.
path
return
route
.
path
===
this
.
$route
.
path
},
},
activeStyle
(
tag
)
{
activeStyle
(
tag
)
{
if
(
!
this
.
isActive
(
tag
))
return
{}
;
if
(
!
this
.
isActive
(
tag
))
return
{}
return
{
return
{
"
background-color
"
:
this
.
theme
,
"
background-color
"
:
this
.
theme
,
"
border-color
"
:
this
.
theme
"
border-color
"
:
this
.
theme
}
;
}
},
},
isAffix
(
tag
)
{
isAffix
(
tag
)
{
return
tag
.
meta
&&
tag
.
meta
.
affix
return
tag
.
meta
&&
tag
.
meta
.
affix
},
},
isFirstView
()
{
isFirstView
()
{
try
{
try
{
return
this
.
selectedTag
.
fullPath
===
this
.
visitedViews
[
1
].
fullPath
||
this
.
selectedTag
.
fullPath
===
'
/index
'
return
this
.
selectedTag
.
fullPath
===
this
.
visitedViews
[
1
].
fullPath
||
this
.
selectedTag
.
fullPath
===
"
/index
"
}
catch
(
err
)
{
}
catch
(
err
)
{
return
false
return
false
}
}
...
@@ -100,9 +89,9 @@ export default {
...
@@ -100,9 +89,9 @@ export default {
return
false
return
false
}
}
},
},
filterAffixTags
(
routes
,
basePath
=
'
/
'
)
{
filterAffixTags
(
routes
,
basePath
=
"
/
"
)
{
let
tags
=
[]
let
tags
=
[]
routes
.
forEach
(
route
=>
{
routes
.
forEach
(
(
route
)
=>
{
if
(
route
.
meta
&&
route
.
meta
.
affix
)
{
if
(
route
.
meta
&&
route
.
meta
.
affix
)
{
const
tagPath
=
path
.
resolve
(
basePath
,
route
.
path
)
const
tagPath
=
path
.
resolve
(
basePath
,
route
.
path
)
tags
.
push
({
tags
.
push
({
...
@@ -122,18 +111,18 @@ export default {
...
@@ -122,18 +111,18 @@ export default {
return
tags
return
tags
},
},
initTags
()
{
initTags
()
{
const
affixTags
=
this
.
affixTags
=
this
.
filterAffixTags
(
this
.
routes
)
const
affixTags
=
(
this
.
affixTags
=
this
.
filterAffixTags
(
this
.
routes
)
)
for
(
const
tag
of
affixTags
)
{
for
(
const
tag
of
affixTags
)
{
// Must have tag name
// Must have tag name
if
(
tag
.
name
)
{
if
(
tag
.
name
)
{
this
.
$store
.
dispatch
(
'
tagsView/addVisitedView
'
,
tag
)
this
.
$store
.
dispatch
(
"
tagsView/addVisitedView
"
,
tag
)
}
}
}
}
},
},
addTags
()
{
addTags
()
{
const
{
name
}
=
this
.
$route
const
{
name
}
=
this
.
$route
if
(
name
)
{
if
(
name
)
{
this
.
$store
.
dispatch
(
'
tagsView/addView
'
,
this
.
$route
)
this
.
$store
.
dispatch
(
"
tagsView/addView
"
,
this
.
$route
)
}
}
return
false
return
false
},
},
...
@@ -145,7 +134,7 @@ export default {
...
@@ -145,7 +134,7 @@ export default {
this
.
$refs
.
scrollPane
.
moveToTarget
(
tag
)
this
.
$refs
.
scrollPane
.
moveToTarget
(
tag
)
// when query is different then update
// when query is different then update
if
(
tag
.
to
.
fullPath
!==
this
.
$route
.
fullPath
)
{
if
(
tag
.
to
.
fullPath
!==
this
.
$route
.
fullPath
)
{
this
.
$store
.
dispatch
(
'
tagsView/updateVisitedView
'
,
this
.
$route
)
this
.
$store
.
dispatch
(
"
tagsView/updateVisitedView
"
,
this
.
$route
)
}
}
break
break
}
}
...
@@ -153,45 +142,45 @@ export default {
...
@@ -153,45 +142,45 @@ export default {
})
})
},
},
refreshSelectedTag
(
view
)
{
refreshSelectedTag
(
view
)
{
this
.
$store
.
dispatch
(
'
tagsView/delCachedView
'
,
view
).
then
(()
=>
{
this
.
$store
.
dispatch
(
"
tagsView/delCachedView
"
,
view
).
then
(()
=>
{
const
{
fullPath
}
=
view
const
{
fullPath
}
=
view
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
$router
.
replace
({
this
.
$router
.
replace
({
path
:
'
/redirect
'
+
fullPath
path
:
"
/redirect
"
+
fullPath
})
})
})
})
})
})
},
},
closeSelectedTag
(
view
)
{
closeSelectedTag
(
view
)
{
this
.
$store
.
dispatch
(
'
tagsView/delView
'
,
view
).
then
(({
visitedViews
})
=>
{
this
.
$store
.
dispatch
(
"
tagsView/delView
"
,
view
).
then
(({
visitedViews
})
=>
{
if
(
this
.
isActive
(
view
))
{
if
(
this
.
isActive
(
view
))
{
this
.
toLastView
(
visitedViews
,
view
)
this
.
toLastView
(
visitedViews
,
view
)
}
}
})
})
},
},
closeRightTags
()
{
closeRightTags
()
{
this
.
$store
.
dispatch
(
'
tagsView/delRightTags
'
,
this
.
selectedTag
).
then
(
visitedViews
=>
{
this
.
$store
.
dispatch
(
"
tagsView/delRightTags
"
,
this
.
selectedTag
).
then
((
visitedViews
)
=>
{
if
(
!
visitedViews
.
find
(
i
=>
i
.
fullPath
===
this
.
$route
.
fullPath
))
{
if
(
!
visitedViews
.
find
(
(
i
)
=>
i
.
fullPath
===
this
.
$route
.
fullPath
))
{
this
.
toLastView
(
visitedViews
)
this
.
toLastView
(
visitedViews
)
}
}
})
})
},
},
closeLeftTags
()
{
closeLeftTags
()
{
this
.
$store
.
dispatch
(
'
tagsView/delLeftTags
'
,
this
.
selectedTag
).
then
(
visitedViews
=>
{
this
.
$store
.
dispatch
(
"
tagsView/delLeftTags
"
,
this
.
selectedTag
).
then
((
visitedViews
)
=>
{
if
(
!
visitedViews
.
find
(
i
=>
i
.
fullPath
===
this
.
$route
.
fullPath
))
{
if
(
!
visitedViews
.
find
(
(
i
)
=>
i
.
fullPath
===
this
.
$route
.
fullPath
))
{
this
.
toLastView
(
visitedViews
)
this
.
toLastView
(
visitedViews
)
}
}
})
})
},
},
closeOthersTags
()
{
closeOthersTags
()
{
this
.
$router
.
push
(
this
.
selectedTag
).
catch
(()
=>
{});
this
.
$router
.
push
(
this
.
selectedTag
).
catch
(()
=>
{})
this
.
$store
.
dispatch
(
'
tagsView/delOthersViews
'
,
this
.
selectedTag
).
then
(()
=>
{
this
.
$store
.
dispatch
(
"
tagsView/delOthersViews
"
,
this
.
selectedTag
).
then
(()
=>
{
this
.
moveToCurrentTag
()
this
.
moveToCurrentTag
()
})
})
},
},
closeAllTags
(
view
)
{
closeAllTags
(
view
)
{
this
.
$store
.
dispatch
(
'
tagsView/delAllViews
'
).
then
(({
visitedViews
})
=>
{
this
.
$store
.
dispatch
(
"
tagsView/delAllViews
"
).
then
(({
visitedViews
})
=>
{
if
(
this
.
affixTags
.
some
(
tag
=>
tag
.
path
===
this
.
$route
.
path
))
{
if
(
this
.
affixTags
.
some
(
(
tag
)
=>
tag
.
path
===
this
.
$route
.
path
))
{
return
return
}
}
this
.
toLastView
(
visitedViews
,
view
)
this
.
toLastView
(
visitedViews
,
view
)
...
@@ -204,11 +193,11 @@ export default {
...
@@ -204,11 +193,11 @@ export default {
}
else
{
}
else
{
// now the default is to redirect to the home page if there is no tags-view,
// now the default is to redirect to the home page if there is no tags-view,
// you can adjust it according to your needs.
// you can adjust it according to your needs.
if
(
view
.
name
===
'
Dashboard
'
)
{
if
(
view
.
name
===
"
Dashboard
"
)
{
// to reload home page
// to reload home page
this
.
$router
.
replace
({
path
:
'
/redirect
'
+
view
.
fullPath
})
this
.
$router
.
replace
({
path
:
"
/redirect
"
+
view
.
fullPath
})
}
else
{
}
else
{
this
.
$router
.
push
(
'
/
'
)
this
.
$router
.
push
(
"
/
"
)
}
}
}
}
},
},
...
@@ -245,7 +234,7 @@ export default {
...
@@ -245,7 +234,7 @@ export default {
width
:
100%
;
width
:
100%
;
background
:
#fff
;
background
:
#fff
;
border-bottom
:
1px
solid
#d8dce5
;
border-bottom
:
1px
solid
#d8dce5
;
box-shadow
:
0
1px
3px
0
rgba
(
0
,
0
,
0
,
.12
)
,
0
0
3px
0
rgba
(
0
,
0
,
0
,
.04
);
box-shadow
:
0
1px
3px
0
rgba
(
0
,
0
,
0
,
0
.12
)
,
0
0
3px
0
rgba
(
0
,
0
,
0
,
0
.04
);
.tags-view-wrapper
{
.tags-view-wrapper
{
.tags-view-item
{
.tags-view-item
{
display
:
inline-block
;
display
:
inline-block
;
...
@@ -271,7 +260,7 @@ export default {
...
@@ -271,7 +260,7 @@ export default {
color
:
#fff
;
color
:
#fff
;
border-color
:
#42b983
;
border-color
:
#42b983
;
&
:
:
before
{
&
:
:
before
{
content
:
''
;
content
:
""
;
background
:
#fff
;
background
:
#fff
;
display
:
inline-block
;
display
:
inline-block
;
width
:
8px
;
width
:
8px
;
...
@@ -294,7 +283,7 @@ export default {
...
@@ -294,7 +283,7 @@ export default {
font-size
:
12px
;
font-size
:
12px
;
font-weight
:
400
;
font-weight
:
400
;
color
:
#333
;
color
:
#333
;
box-shadow
:
2px
2px
3px
0
rgba
(
0
,
0
,
0
,
.3
);
box-shadow
:
2px
2px
3px
0
rgba
(
0
,
0
,
0
,
0
.3
);
li
{
li
{
margin
:
0
;
margin
:
0
;
padding
:
7px
16px
;
padding
:
7px
16px
;
...
@@ -317,10 +306,10 @@ export default {
...
@@ -317,10 +306,10 @@ export default {
vertical-align
:
2px
;
vertical-align
:
2px
;
border-radius
:
50%
;
border-radius
:
50%
;
text-align
:
center
;
text-align
:
center
;
transition
:
all
.3s
cubic-bezier
(
.645
,
.045
,
.355
,
1
);
transition
:
all
0
.3s
cubic-bezier
(
0
.645
,
0
.045
,
0
.355
,
1
);
transform-origin
:
100%
50%
;
transform-origin
:
100%
50%
;
&
:before
{
&
:before
{
transform
:
scale
(
.6
);
transform
:
scale
(
0
.6
);
display
:
inline-block
;
display
:
inline-block
;
vertical-align
:
-3px
;
vertical-align
:
-3px
;
}
}
...
...
src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
View file @
86f87958
...
@@ -317,14 +317,11 @@ export default {
...
@@ -317,14 +317,11 @@ export default {
params
.
orderId
=
orderId
params
.
orderId
=
orderId
params
.
unloadTime
=
this
.
ulWarehouseTime
params
.
unloadTime
=
this
.
ulWarehouseTime
await
order_warehouse_check_force
(
params
).
then
((
res
)
=>
{
await
order_warehouse_check_force
(
params
).
then
((
res
)
=>
{
if
(
res
.
data
){
if
(
res
.
data
)
{
this
.
$router
.
push
(
'
/order/warehousingTo-update?id=
'
+
orderId
)
this
.
$router
.
push
(
"
/order/warehousingTo-update?id=
"
+
orderId
)
}
}
})
})
})
})
},
},
getTotlContent
,
getTotlContent
,
getOrders
(
id
)
{
getOrders
(
id
)
{
...
...
src/views/ecw/order/warehousingTo/components/Warehouse.vue
View file @
86f87958
...
@@ -588,6 +588,7 @@ export default {
...
@@ -588,6 +588,7 @@ export default {
this
.
submitting
=
false
this
.
submitting
=
false
if
(
r
.
data
)
{
if
(
r
.
data
)
{
this
.
$message
.
success
(
r
.
msg
||
"
到仓修改发起成功
"
)
this
.
$message
.
success
(
r
.
msg
||
"
到仓修改发起成功
"
)
this
.
closeSelectedTag
()
this
.
handleClose
()
this
.
handleClose
()
}
else
{
}
else
{
this
.
$message
.
success
(
r
.
msg
||
"
到仓修改发起失败
"
)
this
.
$message
.
success
(
r
.
msg
||
"
到仓修改发起失败
"
)
...
@@ -600,6 +601,32 @@ export default {
...
@@ -600,6 +601,32 @@ export default {
})
})
})
})
},
},
isActive
(
route
)
{
return
route
.
path
===
this
.
$route
.
path
},
closeSelectedTag
()
{
let
view
=
this
.
$route
this
.
$store
.
dispatch
(
"
tagsView/delView
"
,
view
).
then
(({
visitedViews
})
=>
{
if
(
this
.
isActive
(
view
))
{
this
.
toLastView
(
visitedViews
,
view
)
}
})
},
toLastView
(
visitedViews
,
view
)
{
const
latestView
=
visitedViews
.
slice
(
-
1
)[
0
]
if
(
latestView
)
{
this
.
$router
.
push
(
latestView
.
fullPath
)
}
else
{
// now the default is to redirect to the home page if there is no tags-view,
// you can adjust it according to your needs.
if
(
view
.
name
===
"
Dashboard
"
)
{
// to reload home page
this
.
$router
.
replace
({
path
:
"
/redirect
"
+
view
.
fullPath
})
}
else
{
this
.
$router
.
push
(
"
/
"
)
}
}
},
handleCancelProcessInstance
()
{
handleCancelProcessInstance
()
{
this
.
$prompt
(
"
请输入取消原因?
"
,
this
.
$t
(
"
取消流程
"
),
{
this
.
$prompt
(
"
请输入取消原因?
"
,
this
.
$t
(
"
取消流程
"
),
{
type
:
"
warning
"
,
type
:
"
warning
"
,
...
...
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