Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
Project
Project
Details
Activity
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
mes
mes-ui
Commits
16761b67
Commit
16761b67
authored
Apr 10, 2025
by
沈翠玲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
退料申请增加打印按钮
parent
0a89a7c0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
3 deletions
+53
-3
return.js
src/api/mes/pro/return.js
+9
-0
index.vue
src/views/mes/pro/dta/index.vue
+1
-1
index.vue
src/views/mes/pro/return/index.vue
+43
-2
No files found.
src/api/mes/pro/return.js
View file @
16761b67
...
...
@@ -35,6 +35,15 @@ export function addMaterialReturn(data) {
})
}
export
function
getCheckItem
(
data
)
{
return
request
({
url
:
'/pro/materialReturn/materialReturnItem'
,
method
:
'post'
,
headers
:
{
'Content-Type'
:
'application/x-www-form-urlencoded'
},
params
:
data
})
}
// 修改退料申请
export
function
updateMaterialReturn
(
data
)
{
return
request
({
...
...
src/views/mes/pro/dta/index.vue
View file @
16761b67
...
...
@@ -431,7 +431,7 @@ export default {
},
/** 完成按钮操作 */
handleFinish
(
row
)
{
this
.
$modal
.
confirm
(
'是否确认完成?'
).
then
(
function
()
{
this
.
$modal
.
confirm
(
`是否确认组合单
${
row
.
combinationCode
}
的排版任务已经完成?`
).
then
(
function
()
{
return
finishApi
(
row
.
id
);
}).
then
(()
=>
{
this
.
getList
();
...
...
src/views/mes/pro/return/index.vue
View file @
16761b67
...
...
@@ -85,6 +85,16 @@
v-hasPermi=
"['pro:materialReturn:export']"
>
导出
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"success"
plain
size=
"mini"
:disabled=
"single"
@
click=
"handlePrint"
v-hasPermi=
"['pro:materialReturn:print']"
>
打印
</el-button>
</el-col>
<right-toolbar
:showSearch
.
sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
</el-row>
<requestItems
ref=
"requestitemsref"
key=
"requestitemsref"
:applyNos=
"applyNos"
></requestItems>
...
...
@@ -215,8 +225,9 @@
</template>
<
script
>
import
{
listMaterialReturns
,
listMaterialReturn
,
getMaterialReturn
,
delMaterialReturn
,
addMaterialReturn
,
updateMaterialReturn
}
from
"@/api/mes/pro/return"
;
import
{
listMaterialReturns
,
listMaterialReturn
,
getMaterialReturn
,
delMaterialReturn
,
addMaterialReturn
,
updateMaterialReturn
,
getCheckItem
}
from
"@/api/mes/pro/return"
;
import
requestItems
from
"@/components/MaterialReturn/returnItem.vue"
;
import
{
postPrintPdf
}
from
'@/utils/ruoyi'
export
default
{
components
:
{
requestItems
},
name
:
"MaterialReturn"
,
...
...
@@ -234,7 +245,7 @@ export default {
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
selectRows
:
[],
applyNos
:
null
,
// 总条数
total
:
0
,
...
...
@@ -284,6 +295,35 @@ export default {
this
.
getList
();
},
methods
:
{
async
handlePrint
(){
const
row
=
this
.
selectRows
[
0
]
const
recods
=
await
getCheckItem
({
taskId
:
row
.
taskId
,
returnReason
:
''
});
let
b
=
''
;
if
(
recods
.
code
==
200
){
for
(
let
i
=
0
;
i
<
recods
.
data
.
length
;
i
++
){
b
=
b
+
'
\
n'
+
recods
.
data
[
i
].
itemCode
+
':'
+
recods
.
data
[
i
].
batchCode
;
}
postPrintPdf
(
"qrcode-50*50-2"
,
{
detail
:[
{
barcode
:
row
.
applyNo
,
showText
:
'退料单号:'
+
row
.
applyNo
+
b
,
gp
:
1
},
{
barcode
:
row
.
applyNo
,
showText
:
'退料单号:'
+
row
.
applyNo
+
b
,
gp
:
1
}
]
}
);
}
},
/** 查询退料申请列表 */
getList
()
{
this
.
loading
=
true
;
...
...
@@ -363,6 +403,7 @@ export default {
// 多选框选中数据
handleSelectionChange
(
selection
)
{
this
.
ids
=
selection
.
map
(
item
=>
item
.
materialReturnId
)
this
.
selectRows
=
selection
this
.
applyno
=
selection
.
map
(
item
=>
item
.
applyNo
)
this
.
single
=
selection
.
length
!==
1
this
.
multiple
=
!
selection
.
length
...
...
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