Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
weiqiao-vue
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
金民
weiqiao-vue
Commits
4df3fc1e
Commit
4df3fc1e
authored
Mar 24, 2026
by
sunhaiwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生产任务页面添加撤回功能
parent
ff740eaf
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
3 deletions
+46
-3
xjrsoft-vue3/src/api/scgl/scjh/index.ts
+13
-0
xjrsoft-vue3/src/views/scgl/scrw/index.vue
+33
-3
No files found.
xjrsoft-vue3/src/api/scgl/scjh/index.ts
View file @
4df3fc1e
...
...
@@ -10,6 +10,7 @@ enum Api {
MesProductionPlan
=
'/scgl/scjh'
,
Issue
=
'/scgl/scjh/issue'
,
recall
=
'/scgl//scrw/recall'
,
revoke
=
'/scgl/scrw/revoke'
,
}
/**
...
...
@@ -116,3 +117,15 @@ export async function recallMesProductionPlan(jhbhs: string , mode: ErrorMessage
},
);
}
export
async
function
revokeMesProductionTask
(
id
:
string
,
mode
:
ErrorMessageMode
=
'modal'
)
{
return
defHttp
.
get
<
boolean
>
(
{
url
:
Api
.
revoke
,
params
:
{
id
},
},
{
errorMessageMode
:
mode
,
},
);
}
xjrsoft-vue3/src/views/scgl/scrw/index.vue
View file @
4df3fc1e
...
...
@@ -112,6 +112,7 @@
import
{
useConcurrentLock
}
from
'/@/hooks/web/useConcurrentLock'
;
import
{
recallMesProductionPlan
,
revokeMesProductionTask
}
from
"/@/api/scgl/scjh"
;
const
pageParamsInfo
=
ref
<
any
>
({});
const
{
enableLockeData
,
handleOpenFormEnableLockeData
,
handleCloseFormEnableLocke
,
handleHasEnableLocke
}
=
...
...
@@ -131,9 +132,9 @@
//展示在列表内的按钮
const
actionButtons
=
ref
<
string
[]
>
([
"view"
,
"edit"
,
"ddzh"
,
"delete"
]);
const
actionButtons
=
ref
<
string
[]
>
([
"view"
,
"edit"
,
"ddzh"
,
"delete"
,
"chehui"
]);
const
buttonConfigs
=
computed
(()
=>
{
const
list
=
[{
"buttonId"
:
"2008813468518432768"
,
"name"
:
"查看"
,
"code"
:
"view"
,
"icon"
:
"ant-design:eye-outlined"
,
"isDefault"
:
true
,
"isUse"
:
true
},{
"buttonId"
:
"2008813468518432769"
,
"name"
:
"新增"
,
"code"
:
"add"
,
"icon"
:
"ant-design:plus-outlined"
,
"isDefault"
:
true
,
"isUse"
:
true
},{
"buttonId"
:
"2008813468518432770"
,
"name"
:
"编辑"
,
"code"
:
"edit"
,
"icon"
:
"ant-design:form-outlined"
,
"isDefault"
:
true
,
"isUse"
:
true
,
"isEnableLock"
:
true
},{
"buttonId"
:
"2008813468518432771"
,
"name"
:
"打印"
,
"code"
:
"sclld"
,
"icon"
:
"ant-design:file-text-outlined"
,
"isDefault"
:
false
,
"isUse"
:
true
,
"setting"
:[],
"showType"
:
"top"
,
"buttonType"
:
"primary"
},{
"isUse"
:
true
,
"name"
:
"订单转换"
,
"code"
:
"ddzh"
,
"icon"
:
""
,
"isDefault"
:
false
,
"setting"
:[],
"showType"
:
"inline"
,
"buttonType"
:
"modal"
,
"modal"
:{
"bindModal"
:
"2010615112372113410"
,
"innerParams"
:[{
"name"
:
"任务ID"
,
"type"
:
"value"
,
"value"
:
"1"
,
"apiConfig"
:{
"path"
:
"CodeGeneration/selection"
,
"method"
:
"GET"
,
"apiId"
:
"93d735dcb7364a0f8102188ec4d77ac7"
},
"component"
:
"{
\"
table
\"
:
\"
table_19041
\"
,
\"
field
\"
:
\"
ren_wuid1465
\"
}"
},{
"name"
:
"任务编号"
,
"type"
:
"value"
,
"value"
:
"CCRW001"
,
"apiConfig"
:{
"path"
:
"CodeGeneration/selection"
,
"method"
:
"GET"
,
"apiId"
:
"93d735dcb7364a0f8102188ec4d77ac7"
},
"component"
:
"{
\"
table
\"
:
\"
table_19041
\"
,
\"
field
\"
:
\"
zhuan_huan_qian_ding_dan5032
\"
}"
}],
"outParams"
:[{
"name"
:
"转换后"
,
"component"
:
"{
\"
table
\"
:
\"
table_19041
\"
,
\"
field
\"
:
\"
zhuan_huan_hou_ding_dan6513
\"
}"
,
"mainComponent"
:
""
}],
"modalWidth"
:
900
,
"modalWidthUnit"
:
"px"
,
"modalHeight"
:
300
,
"modalHeightUnit"
:
"px"
,
"title"
:
"订单转换"
,
"confirm"
:
""
,
"cancel"
:
""
,
"open"
:
""
,
"close"
:
""
}},{
"buttonId"
:
"2008813468518432772"
,
"name"
:
"删除"
,
"code"
:
"delete"
,
"icon"
:
"ant-design:delete-outlined"
,
"isDefault"
:
true
,
"isUse"
:
true
}]
const
list
=
[{
"buttonId"
:
"2008813468518432768"
,
"name"
:
"查看"
,
"code"
:
"view"
,
"icon"
:
"ant-design:eye-outlined"
,
"isDefault"
:
true
,
"isUse"
:
true
},{
"buttonId"
:
"2008813468518432769"
,
"name"
:
"新增"
,
"code"
:
"add"
,
"icon"
:
"ant-design:plus-outlined"
,
"isDefault"
:
true
,
"isUse"
:
true
},{
"buttonId"
:
"2008813468518432770"
,
"name"
:
"编辑"
,
"code"
:
"edit"
,
"icon"
:
"ant-design:form-outlined"
,
"isDefault"
:
true
,
"isUse"
:
true
,
"isEnableLock"
:
true
},{
"
isUse"
:
true
,
"name"
:
"撤回"
,
"code"
:
"chehui"
,
"icon"
:
"ant-design:loading-3-quarters-outlined"
,
"isDefault"
:
false
,
"setting"
:[],
"showType"
:
"top"
,
"buttonType"
:
"primary"
},{
"
buttonId"
:
"2008813468518432771"
,
"name"
:
"打印"
,
"code"
:
"sclld"
,
"icon"
:
"ant-design:file-text-outlined"
,
"isDefault"
:
false
,
"isUse"
:
true
,
"setting"
:[],
"showType"
:
"top"
,
"buttonType"
:
"primary"
},{
"isUse"
:
true
,
"name"
:
"订单转换"
,
"code"
:
"ddzh"
,
"icon"
:
""
,
"isDefault"
:
false
,
"setting"
:[],
"showType"
:
"inline"
,
"buttonType"
:
"modal"
,
"modal"
:{
"bindModal"
:
"2010615112372113410"
,
"innerParams"
:[{
"name"
:
"任务ID"
,
"type"
:
"value"
,
"value"
:
"1"
,
"apiConfig"
:{
"path"
:
"CodeGeneration/selection"
,
"method"
:
"GET"
,
"apiId"
:
"93d735dcb7364a0f8102188ec4d77ac7"
},
"component"
:
"{
\"
table
\"
:
\"
table_19041
\"
,
\"
field
\"
:
\"
ren_wuid1465
\"
}"
},{
"name"
:
"任务编号"
,
"type"
:
"value"
,
"value"
:
"CCRW001"
,
"apiConfig"
:{
"path"
:
"CodeGeneration/selection"
,
"method"
:
"GET"
,
"apiId"
:
"93d735dcb7364a0f8102188ec4d77ac7"
},
"component"
:
"{
\"
table
\"
:
\"
table_19041
\"
,
\"
field
\"
:
\"
zhuan_huan_qian_ding_dan5032
\"
}"
}],
"outParams"
:[{
"name"
:
"转换后"
,
"component"
:
"{
\"
table
\"
:
\"
table_19041
\"
,
\"
field
\"
:
\"
zhuan_huan_hou_ding_dan6513
\"
}"
,
"mainComponent"
:
""
}],
"modalWidth"
:
900
,
"modalWidthUnit"
:
"px"
,
"modalHeight"
:
300
,
"modalHeightUnit"
:
"px"
,
"title"
:
"订单转换"
,
"confirm"
:
""
,
"cancel"
:
""
,
"open"
:
""
,
"close"
:
""
}},{
"buttonId"
:
"2008813468518432772"
,
"name"
:
"删除"
,
"code"
:
"delete"
,
"icon"
:
"ant-design:delete-outlined"
,
"isDefault"
:
true
,
"isUse"
:
true
}]
return
filterButtonAuth
(
list
);
})
...
...
@@ -145,7 +146,7 @@
return
buttonConfigs
.
value
?.
filter
((
x
)
=>
actionButtons
.
value
.
includes
(
x
.
code
));
});
const
btnEvent
=
{
view
:
handleView
,
add
:
handleAdd
,
edit
:
handleEdit
,
delete
:
handleDelete
,}
const
btnEvent
=
{
view
:
handleView
,
add
:
handleAdd
,
edit
:
handleEdit
,
delete
:
handleDelete
,
chehui
:
handleBack
}
const
{
currentRoute
}
=
useRouter
();
...
...
@@ -273,6 +274,35 @@
deleteList
([
record
.
id
]);
}
function
handleBack
(
record
:
Recordable
)
{
Modal
.
confirm
({
title
:
t
(
'提示信息'
),
icon
:
createVNode
(
ExclamationCircleOutlined
),
content
:
t
(
'是否撤回?'
),
okText
:
t
(
'确认'
),
cancelText
:
t
(
'取消'
),
async
onOk
()
{
let
zt
=
record
.
zt
;
if
(
zt
!=
'未开始'
)
{
Modal
.
warning
({
title
:
'提示'
,
content
:
'不是未开始的任务无法撤回'
,
});
return
;
}
const
id
=
record
.
id
;
revokeMesProductionTask
(
id
).
then
((
_
)
=>
{
handleSuccess
();
notification
.
success
({
message
:
'Tip'
,
description
:
'撤回成功!'
,
});
});
},
onCancel
()
{},
});
}
function
deleteList
(
ids
)
{
Modal
.
confirm
({
title
:
'提示信息'
,
...
...
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