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
bccf47d9
Commit
bccf47d9
authored
May 21, 2023
by
zhoutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
处理预装关联订单的一些bug
parent
bfe01737
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
7 deletions
+22
-7
boxSea.js
src/api/ecw/boxSea.js
+3
-2
startPacking.vue
...ews/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
+1
-1
supplementOrder.vue
.../ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue
+8
-1
preinstall.vue
src/views/ecw/box/shippingSea/nodePage/preinstall.vue
+9
-2
index.vue
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
+1
-1
No files found.
src/api/ecw/boxSea.js
View file @
bccf47d9
...
...
@@ -506,10 +506,11 @@ export function boxGoodsDetail(data) {
* @param {*} id
* @return {*}
*/
export
function
deleteSection
(
id
)
{
export
function
deleteSection
(
params
)
{
return
request
({
url
:
"
/ecw/box-preload-goods/deleteSection
?id=
"
+
id
,
url
:
"
/ecw/box-preload-goods/deleteSection
"
,
method
:
"
delete
"
,
params
});
}
...
...
src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
View file @
bccf47d9
...
...
@@ -537,7 +537,7 @@ export default {
});
}).
catch
((
res
)
=>
{
if
(
res
.
code
===
666
)
{
this
.
$confirm
(
res
.
msg
+
this
.
$t
(
'
是否需要一起移出?
'
)
,
this
.
$t
(
"
提示
"
),
{
this
.
$confirm
(
"
<div style='max-height:500px;overflow:auto'>
"
+
res
.
msg
+
this
.
$t
(
'
是否需要一起移出?
'
)
+
"
</div>
"
,
this
.
$t
(
"
提示
"
),
{
dangerouslyUseHTMLString
:
true
,
distinguishCancelAndClose
:
true
,
confirmButtonText
:
'
确定移出
'
,
...
...
src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue
View file @
bccf47d9
...
...
@@ -293,6 +293,7 @@ export default {
if
(
data
.
relationMsg
)
{
const
msg
=
data
.
relationMsg
.
replaceAll
(
"
,
"
,
"
,
"
);
this
.
$confirm
(
msg
,
this
.
$t
(
"
提示
"
),
{
dangerouslyUseHTMLString
:
true
,
type
:
"
warning
"
,
})
.
then
((
_
)
=>
{
...
...
@@ -315,6 +316,7 @@ export default {
if
(
res
.
code
===
555
)
{
const
msg
=
res
.
msg
&&
res
.
msg
.
replaceAll
(
"
,
"
,
"
,
"
);
this
.
$confirm
(
msg
,
this
.
$t
(
"
提示
"
),
{
dangerouslyUseHTMLString
:
true
,
type
:
"
warning
"
,
})
.
then
((
_
)
=>
{
...
...
@@ -331,6 +333,7 @@ export default {
if
(
res
.
code
===
566
)
{
this
.
$confirm
(
res
.
msg
+
this
.
$t
(
'
是否需要一起预装?
'
),
this
.
$t
(
"
提示
"
),
{
dangerouslyUseHTMLString
:
true
,
type
:
"
warning
"
,
})
.
then
((
_
)
=>
{
...
...
@@ -367,7 +370,11 @@ export default {
}
)
.
then
((
_
)
=>
{
deleteSection
(
this
.
partData
.
id
).
then
((
res
)
=>
{
let
params
=
{
id
:
this
.
partData
.
id
,
deleteType
:
2
};
deleteSection
(
params
).
then
((
res
)
=>
{
serviceMsg
(
res
,
this
).
then
(()
=>
{
this
.
partData
=
{};
this
.
getSecGoods
();
...
...
src/views/ecw/box/shippingSea/nodePage/preinstall.vue
View file @
bccf47d9
...
...
@@ -631,7 +631,11 @@ export default {
}
)
.
then
((
_
)
=>
{
deleteSection
(
part
.
id
).
then
((
res
)
=>
{
let
params
=
{
id
:
part
.
id
,
deleteType
:
2
}
;
deleteSection
(
params
).
then
((
res
)
=>
{
serviceMsg
(
res
,
this
).
then
(()
=>
{
this
.
queryAllData
();
}
);
...
...
@@ -657,6 +661,7 @@ export default {
if
(
data
.
relationMsg
)
{
const
msg
=
data
.
relationMsg
.
replaceAll
(
"
,
"
,
"
,
"
);
this
.
$confirm
(
msg
,
this
.
$t
(
"
提示
"
),
{
dangerouslyUseHTMLString
:
true
,
type
:
"
warning
"
,
}
)
.
then
((
_
)
=>
{
...
...
@@ -679,6 +684,7 @@ export default {
if
(
res
.
code
===
555
)
{
const
msg
=
res
.
msg
&&
res
.
msg
.
replaceAll
(
"
,
"
,
"
,
"
);
this
.
$confirm
(
msg
,
this
.
$t
(
"
提示
"
),
{
dangerouslyUseHTMLString
:
true
,
type
:
"
warning
"
,
}
)
.
then
((
_
)
=>
{
...
...
@@ -695,6 +701,7 @@ export default {
if
(
res
.
code
===
566
)
{
this
.
$confirm
(
res
.
msg
+
this
.
$t
(
'
是否需要一起预装?
'
),
this
.
$t
(
"
提示
"
),
{
dangerouslyUseHTMLString
:
true
,
type
:
"
warning
"
,
}
)
.
then
((
_
)
=>
{
...
...
@@ -746,7 +753,7 @@ export default {
}
);
}
).
catch
((
res
)
=>
{
if
(
res
.
code
===
666
)
{
this
.
$confirm
(
res
.
msg
+
this
.
$t
(
'
是否需要一起移出?
'
)
,
this
.
$t
(
"
提示
"
),
{
this
.
$confirm
(
"
<div style='max-height:500px;overflow:auto'>
"
+
res
.
msg
+
this
.
$t
(
'
是否需要一起移出?
'
)
+
"
</div>
"
,
this
.
$t
(
"
提示
"
),
{
dangerouslyUseHTMLString
:
true
,
distinguishCancelAndClose
:
true
,
confirmButtonText
:
'
确定移出
'
,
...
...
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
View file @
bccf47d9
...
...
@@ -250,7 +250,7 @@ export default {
});
}).
catch
((
res
)
=>
{
if
(
res
.
code
===
666
)
{
this
.
$confirm
(
res
.
msg
+
this
.
$t
(
'
是否需要一起移出?
'
)
,
this
.
$t
(
"
提示
"
),
{
this
.
$confirm
(
"
<div style='max-height:500px;overflow:auto'>
"
+
res
.
msg
+
this
.
$t
(
'
是否需要一起移出?
'
)
+
"
</div>
"
,
this
.
$t
(
"
提示
"
),
{
dangerouslyUseHTMLString
:
true
,
distinguishCancelAndClose
:
true
,
confirmButtonText
:
'
确定移出
'
,
...
...
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