Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
factory_front
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
qinjianhui
factory_front
Commits
5b734766
Commit
5b734766
authored
May 13, 2026
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 工厂订单挂起状态增加拦截成功和拦截失败功能
parent
ff5bc346
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
135 additions
and
4 deletions
+135
-4
src/api/factoryOrderNew.ts
+17
-0
src/views/order/factoryOrderNew/index.vue
+118
-4
No files found.
src/api/factoryOrderNew.ts
View file @
5b734766
...
...
@@ -590,3 +590,20 @@ export function exportFactoryOrderInfo(data: ExportParams) {
data
,
)
}
export
function
interceptUpdateApi
(
ids
:
(
string
|
number
)[])
{
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
'factory/podOrder/interceptUpdate'
,
ids
,
)
}
export
function
interceptSuccessApi
(
data
:
{
ids
:
(
string
|
number
)[]
interceptType
:
number
})
{
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
'factory/podOrder/interceptSuccess'
,
data
,
)
}
src/views/order/factoryOrderNew/index.vue
View file @
5b734766
...
...
@@ -384,10 +384,7 @@
}}
<
/ElButton
>
<
/span
>
<
span
v
-
if
=
"status === 'PENDING_RECEIVE' || status === 'SUSPEND'"
class
=
"item"
>
<
span
v
-
if
=
"status === 'PENDING_RECEIVE'"
class
=
"item"
>
<
ElButton
type
=
"danger"
@
click
=
"handleCancelOrder"
>
取消订单
<
/ElButton
>
<
/span
>
...
...
@@ -571,6 +568,16 @@
>
<
/span
>
<
span
class
=
"item"
>
<
ElButton
type
=
"success"
@
click
=
"handleInterceptionSuccess"
>
拦截成功
<
/ElButto
n
>
<
/span
>
<
span
class
=
"item"
>
<
ElButton
type
=
"danger"
@
click
=
"handleInterceptionFail"
>
拦截失败
<
/ElButto
n
>
<
/span
>
<
span
class
=
"item"
>
<
ElButton
type
=
"primary"
@
click
=
"handleSyncAddress"
>
同步收货地址
<
/ElButto
n
>
...
...
@@ -916,6 +923,53 @@
@
success
=
"() => refreshCurrentView({ isRefreshTree: true
}
)"
/>
<
ElDialog
v
-
model
=
"interceptSuccessDialogVisible"
title
=
"提示"
width
=
"480px"
:
close
-
on
-
click
-
modal
=
"false"
>
<
ElForm
ref
=
"interceptSuccessFormRef"
:
model
=
"interceptSuccessForm"
>
<
ElFormItem
label
=
"拦截成功类型"
prop
=
"interceptType"
:
rules
=
"[
{
required: true,
message: '请选择拦截成功类型',
trigger: 'change',
}
,
]"
>
<
ElSelect
v
-
model
=
"interceptSuccessForm.interceptType"
placeholder
=
"请选择"
style
=
"width: 100%"
clearable
>
<
ElOption
v
-
for
=
"opt in interceptSuccessTypeOptions"
:
key
=
"opt.value"
:
label
=
"opt.label"
:
value
=
"opt.value"
/>
<
/ElSelect
>
<
/ElFormItem
>
<
/ElForm
>
<
p
style
=
"padding-left: 12px"
>
拦截成功,订单会流转到已取消,确认是否通过拦截申请?
<
/p
>
<
template
#
footer
>
<
div
class
=
"dialog-footer"
style
=
"text-align: center"
>
<
ElButton
@
click
=
"interceptSuccessDialogVisible = false"
>
取消
<
/ElButto
n
>
<
ElButton
type
=
"primary"
@
click
=
"submitInterceptSuccess"
>
确定
<
/ElButto
n
>
<
/div
>
<
/template
>
<
/ElDialog
>
<
ElDialog
v
-
model
=
"exportVisible"
title
=
"导出选项"
width
=
"500px"
...
...
@@ -989,6 +1043,8 @@ import {
statusPushApi
,
arrangeFinishApi
,
exportFactoryOrderInfo
,
interceptUpdateApi
,
interceptSuccessApi
,
}
from
'@/api/factoryOrderNew'
import
{
getLogisticsWayApi
}
from
'@/api/podUsOrder'
import
BigNumber
from
'bignumber.js'
...
...
@@ -1035,6 +1091,16 @@ const exportForm = ref({
resource
:
''
,
}
)
const
interceptSuccessDialogVisible
=
ref
(
false
)
const
interceptSuccessFormRef
=
ref
()
const
interceptSuccessTypeOptions
=
[
{
label
:
'生产拦截成功'
,
value
:
1
}
,
{
label
:
'发货拦截成功'
,
value
:
2
}
,
]
const
interceptSuccessForm
=
ref
<
{
interceptType
:
number
|
undefined
}
>
({
interceptType
:
undefined
,
}
)
const
{
userMarkList
,
receiverCountryList
,
...
...
@@ -2483,6 +2549,54 @@ const getLogisticsWay = async () => {
const
{
data
}
=
await
getLogisticsWayApi
()
logisticsWayList
.
value
=
data
}
const
handleInterceptionSuccess
=
()
=>
{
if
(
!
ensureSelection
())
return
interceptSuccessForm
.
value
.
interceptType
=
undefined
interceptSuccessDialogVisible
.
value
=
true
nextTick
(()
=>
interceptSuccessFormRef
.
value
?.
clearValidate
())
}
const
submitInterceptSuccess
=
async
()
=>
{
const
form
=
interceptSuccessFormRef
.
value
if
(
!
form
)
return
try
{
await
form
.
validate
()
}
catch
{
return
}
const
interceptType
=
interceptSuccessForm
.
value
.
interceptType
if
(
interceptType
===
undefined
)
return
const
loading
=
ElLoading
.
service
({
fullscreen
:
true
,
text
:
'操作中...'
,
background
:
'rgba(0, 0, 0, 0.3)'
,
}
)
try
{
const
res
=
await
interceptSuccessApi
({
ids
:
getSelectedIds
(),
interceptType
,
}
)
if
(
res
.
code
!==
200
)
return
ElMessage
.
success
(
'操作成功'
)
interceptSuccessDialogVisible
.
value
=
false
refreshCurrentView
({
isRefreshTree
:
true
}
)
}
catch
(
e
)
{
console
.
error
(
e
)
}
finally
{
loading
.
close
()
}
}
const
handleInterceptionFail
=
async
()
=>
{
await
executeBatchAction
({
getIds
:
getSelectedIds
,
api
:
(
ids
)
=>
interceptUpdateApi
(
ids
as
number
[]),
confirmText
:
'拦截失败,订单会恢复到拦截前的状态,确认是否拒绝拦截申请?'
,
successText
:
'拦截失败成功'
,
}
)
}
onMounted
(()
=>
{
loadStatusTreeCounts
()
loadAllDictionaries
()
...
...
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