Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes-pad
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
ximai
mes-pad
Commits
33961f3a
Commit
33961f3a
authored
Mar 19, 2024
by
chenzj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增生产报工打印功能
parent
48be7531
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
7 deletions
+34
-7
index.vue
pages/mes/prodReport/index.vue
+34
-7
No files found.
pages/mes/prodReport/index.vue
View file @
33961f3a
...
@@ -170,15 +170,21 @@
...
@@ -170,15 +170,21 @@
</u-row>
</u-row>
<u-row>
<u-row>
<u-col
span=
"6"
>
<u-col
span=
"6"
>
<u-form-item
label=
"是否打印"
prop=
"print
Name
"
>
<u-form-item
label=
"是否打印"
prop=
"print"
>
<view
class=
"uni-list-item__extra"
>
<view
class=
"uni-list-item__extra"
>
<u-radio-group
v-model=
"feedback.
printName
"
>
<u-radio-group
v-model=
"feedback.
whether
"
>
<u-radio
:name=
"1"
>
是
</u-radio>
<u-radio
:name=
"1"
>
是
</u-radio>
<u-radio
:name=
"0"
>
否
</u-radio>
<u-radio
:name=
"0"
>
否
</u-radio>
</u-radio-group>
</u-radio-group>
</view>
</view>
</u-form-item>
</u-form-item>
</u-col>
</u-col>
<u-col
span=
"6"
>
<u-form-item
v-if=
"feedback.whether=='1'"
label=
"打印内容"
prop=
"printContents"
>
{{
feedback
.
printContents
}}
<!--
<u-input
v-model=
"feedback."
></u-input>
-->
</u-form-item>
</u-col>
</u-row>
</u-row>
<view
v-if=
"feedback.isLastProcess"
>
<view
v-if=
"feedback.isLastProcess"
>
<u-row>
<u-row>
...
@@ -624,6 +630,7 @@ import SearchInput from '@/components/ScanInput/index.vue';
...
@@ -624,6 +630,7 @@ import SearchInput from '@/components/ScanInput/index.vue';
import
dModelList
from
'./components/dModelList.vue'
;
import
dModelList
from
'./components/dModelList.vue'
;
import
userPersonnel
from
'./components/userPersonnel.vue'
;
import
userPersonnel
from
'./components/userPersonnel.vue'
;
import
UButton
from
'../../../uview-ui/components/u-button/u-button.vue'
;
import
UButton
from
'../../../uview-ui/components/u-button/u-button.vue'
;
import
{
handleError
}
from
"vue"
;
export
default
{
export
default
{
name
:
'ProdReport'
,
name
:
'ProdReport'
,
components
:
{
components
:
{
...
@@ -940,6 +947,7 @@ export default {
...
@@ -940,6 +947,7 @@ export default {
applyNum
:
null
,
applyNum
:
null
,
workorderCode
:
null
workorderCode
:
null
},
},
userTempVisible
:
false
,
userTempVisible
:
false
,
materialReturnFormVisible
:
false
,
materialReturnFormVisible
:
false
,
...
@@ -1261,6 +1269,7 @@ userTempVisible: false,
...
@@ -1261,6 +1269,7 @@ userTempVisible: false,
const
items
=
row
.
workorderList
.
find
((
item
)
=>
item
.
workorderId
===
id
);
const
items
=
row
.
workorderList
.
find
((
item
)
=>
item
.
workorderId
===
id
);
row
.
workorderCode
=
items
.
workorderCode
;
row
.
workorderCode
=
items
.
workorderCode
;
row
.
printName
=
items
.
workorderCode
;
row
.
printName
=
items
.
workorderCode
;
row
.
printContents
=
row
.
arrangeCode
+
row
.
workorderCode
row
.
sizeList
=
row
.
sizeData
[
id
];
row
.
sizeList
=
row
.
sizeData
[
id
];
row
.
directiveList
=
row
.
directiveData
[
id
];
row
.
directiveList
=
row
.
directiveData
[
id
];
row
.
packByDirective
=
items
.
packByDirective
;
row
.
packByDirective
=
items
.
packByDirective
;
...
@@ -1502,6 +1511,8 @@ userTempVisible: false,
...
@@ -1502,6 +1511,8 @@ userTempVisible: false,
sizeList
:[],
sizeList
:[],
directiveData
:
{},
directiveData
:
{},
sizeData
:
{},
sizeData
:
{},
printContents
:
item
.
arrangeCode
,
whether
:
''
,
};
};
this
.
getWorkorderWithSizeAndDirective
(
feedback
);
this
.
getWorkorderWithSizeAndDirective
(
feedback
);
this
.
feedbackForms
.
push
(
feedback
);
this
.
feedbackForms
.
push
(
feedback
);
...
@@ -1556,7 +1567,7 @@ userTempVisible: false,
...
@@ -1556,7 +1567,7 @@ userTempVisible: false,
return
;
return
;
}
}
}
}
//
如果
工单
//工单
this
.
$u
.
api
this
.
$u
.
api
.
feedback
({
.
feedback
({
taskWorkunitId
:
item
.
taskWorkunitId
,
taskWorkunitId
:
item
.
taskWorkunitId
,
...
@@ -1583,13 +1594,29 @@ userTempVisible: false,
...
@@ -1583,13 +1594,29 @@ userTempVisible: false,
startTime
:
item
.
scheduleStartDate
,
startTime
:
item
.
scheduleStartDate
,
workorderSoDirectiveId
:
item
.
workorderSoDirectiveId
,
workorderSoDirectiveId
:
item
.
workorderSoDirectiveId
,
workorderSoSizeItemId
:
item
.
workorderSoSizeItemId
,
workorderSoSizeItemId
:
item
.
workorderSoSizeItemId
,
netWeight
:
item
.
netWeight
netWeight
:
item
.
netWeight
,
})
printContents
:
item
.
whether
==
'1'
?
item
.
printContents
:
null
})
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
code
===
200
)
{
if
(
res
.
code
===
200
)
{
this
.
open
=
false
;
this
.
open
=
false
;
if
(
res
.
msg
===
''
)
{
if
(
res
.
msg
===
'
操作成功
'
)
{
this
.
$u
.
toast
(
'上报成功'
);
this
.
$u
.
toast
(
'上报成功'
);
if
(
item
.
whether
==
'1'
){
this
.
printPdfSocket
({
reportName
:
'mysql:qrcode-50*50-2'
,
values
:
{
detail
:
[
{
barcode
:
item
.
printContents
,
gp
:
item
.
printContents
},
],
},
})
}
}
else
{
}
else
{
this
.
$u
.
toast
(
res
.
msg
);
this
.
$u
.
toast
(
res
.
msg
);
}
}
...
...
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