Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
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
李俊赕
self-support
Commits
b4d61bf4
Commit
b4d61bf4
authored
Aug 11, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-1.4.3' into test
parents
96955176
29b2120c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
order.js
src/common/api/order.js
+4
-2
order.vue
src/pages/index/order.vue
+4
-1
complete.vue
src/pages/order/complete.vue
+2
-5
No files found.
src/common/api/order.js
View file @
b4d61bf4
...
@@ -196,7 +196,8 @@ let orderApiFun = function(vm){
...
@@ -196,7 +196,8 @@ let orderApiFun = function(vm){
let
receiveParts
=
async
(
partOrderId
)
=>
await
vm
.
$u
.
put
(
prefix
+
'parts/'
+
vm
.
vuex_token
+
'/orders/'
+
partOrderId
+
'/receive'
,{},
formType
);
let
receiveParts
=
async
(
partOrderId
)
=>
await
vm
.
$u
.
put
(
prefix
+
'parts/'
+
vm
.
vuex_token
+
'/orders/'
+
partOrderId
+
'/receive'
,{},
formType
);
// 配件申请单-取消申请
// 配件申请单-取消申请
let
cancelParts
=
async
(
partOrderId
)
=>
await
vm
.
$u
.
put
(
prefix
+
'parts/'
+
vm
.
vuex_token
+
'/orders/'
+
partOrderId
+
'/cancel'
,{},
formType
);
let
cancelParts
=
async
(
partOrderId
)
=>
await
vm
.
$u
.
put
(
prefix
+
'parts/'
+
vm
.
vuex_token
+
'/orders/'
+
partOrderId
+
'/cancel'
,{},
formType
);
// 点击了异常单去处理
let
workerDealWithError
=
async
(
orderId
,
params
=
{})
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/workerDealWithError'
,
params
)
const
orderApi
=
{
const
orderApi
=
{
listByRecommendOrder
,
listByRecommendOrder
,
listOrderCount
,
listOrderCount
,
...
@@ -247,7 +248,8 @@ let orderApiFun = function(vm){
...
@@ -247,7 +248,8 @@ let orderApiFun = function(vm){
getLogistics
,
getLogistics
,
getOrderPartsSum
,
getOrderPartsSum
,
receiveParts
,
receiveParts
,
cancelParts
cancelParts
,
workerDealWithError
}
}
return
orderApi
return
orderApi
}
}
...
...
src/pages/index/order.vue
View file @
b4d61bf4
...
@@ -300,7 +300,10 @@ export default {
...
@@ -300,7 +300,10 @@ export default {
}
}
})
})
},
},
handleClickCellButton
(
item
)
{
handleClickCellButton
(
item
,
type
)
{
if
(
type
==
'exception'
)
{
this
.
$u
.
api
.
workerDealWithError
(
item
.
orderId
).
then
(()
=>
{})
}
// 去完工
// 去完工
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
url
:
...
...
src/pages/order/complete.vue
View file @
b4d61bf4
...
@@ -649,10 +649,8 @@ export default {
...
@@ -649,10 +649,8 @@ export default {
// this.showTab = this.list.length > 1
// this.showTab = this.list.length > 1
// 异常单处理
// 异常单处理
if
(
if
(
this
.
orderStatus
===
'88'
||
this
.
orderStatus
===
'86'
)
this
.
auditResults
.
length
>
0
&&
{
(
this
.
orderStatus
===
'88'
||
this
.
orderStatus
===
'86'
)
)
{
this
.
checkCompleteError
(
list
)
this
.
checkCompleteError
(
list
)
}
else
{
}
else
{
this
.
list
=
list
this
.
list
=
list
...
@@ -809,7 +807,6 @@ export default {
...
@@ -809,7 +807,6 @@ export default {
if
(
!
hasMate
||
!
this
.
$u
.
test
.
isEmpty
(
mateRow
))
{
if
(
!
hasMate
||
!
this
.
$u
.
test
.
isEmpty
(
mateRow
))
{
panelResult
.
submitted
++
panelResult
.
submitted
++
}
}
panelResult
.
submitted
++
}
else
{
}
else
{
panelResult
.
submitted
++
panelResult
.
submitted
++
}
}
...
...
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