Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
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
TFMOM
TF-MOM-WEB
Commits
e6c5b21f
Commit
e6c5b21f
authored
Aug 09, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP相关_领用出库确认增加响应及打印标签
parent
6ef3b623
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
4 deletions
+51
-4
right.vue
.../components/ERP_OutStorageOutConfirm/components/right.vue
+21
-4
index.vue
.../privateComponents/components/printTagForConfig/index.vue
+30
-0
No files found.
applications/dee-mes/src/privateComponents/components/ERP_OutStorageOutConfirm/components/right.vue
View file @
e6c5b21f
...
@@ -11,6 +11,15 @@
...
@@ -11,6 +11,15 @@
ref=
"itemCom"
ref=
"itemCom"
:lay-config=
"
{ typeName: 'OutStorageMaterialUseItem', layKey: 'defaultResult'}"
:lay-config=
"
{ typeName: 'OutStorageMaterialUseItem', layKey: 'defaultResult'}"
table-height="auto"
table-height="auto"
:basic-data=" { selectData,selectionRowsItem,...currentLeftData }"
@selectionChange="selectionChangeItem"
/>
<dee-as-com
ref=
"responseTable"
:lay-config=
"
{ typeName: 'JobResponseOutStorageMaterialUse', layKey: 'defaultResult'}"
table-height="auto"
:basic-data=" { selectData,selectionRowsRes,...currentLeftData }"
@selectionChangeRes="selectionChangeRes"
/>
/>
</div>
</div>
</
template
>
</
template
>
...
@@ -32,8 +41,8 @@ export default {
...
@@ -32,8 +41,8 @@ export default {
data
()
{
data
()
{
return
{
return
{
selectionRows
:
[],
selectionRows
:
[],
selection
ItemRows
:
[],
selection
RowsItem
:
[],
selection
JobResRow
s
:
[]
selection
RowsRe
s
:
[]
}
}
},
},
computed
:
{},
computed
:
{},
...
@@ -48,8 +57,13 @@ export default {
...
@@ -48,8 +57,13 @@ export default {
const
requestIds
=
val
&&
val
.
map
(
item
=>
item
.
id
)
const
requestIds
=
val
&&
val
.
map
(
item
=>
item
.
id
)
this
.
$refs
.
itemCom
&&
this
.
$refs
.
itemCom
.
$refs
.
asCom
.
getData
(
requestIds
)
this
.
$refs
.
itemCom
&&
this
.
$refs
.
itemCom
.
$refs
.
asCom
.
getData
(
requestIds
)
},
},
selectionChange_jobRes
(
val
)
{
selectionChangeItem
(
val
)
{
this
.
selectionJobResRows
=
val
this
.
selectionRowsItem
=
val
const
itemIds
=
val
&&
val
.
map
(
item
=>
item
.
id
)
||
[]
this
.
$refs
.
responseTable
&&
this
.
$refs
.
responseTable
.
$refs
.
asCom
.
getData
(
itemIds
)
},
selectionChangeRes
(
val
)
{
this
.
selectionRowsRes
=
val
},
},
init
(
checkList
)
{
init
(
checkList
)
{
const
aoIds
=
checkList
&&
checkList
.
map
(
item
=>
item
.
id
)
const
aoIds
=
checkList
&&
checkList
.
map
(
item
=>
item
.
id
)
...
@@ -63,10 +77,13 @@ export default {
...
@@ -63,10 +77,13 @@ export default {
setTimeout
(()
=>
{
setTimeout
(()
=>
{
const
requestComRef
=
this
.
$refs
.
requestCom
&&
(
this
.
$refs
.
requestCom
.
$refs
.
asCom
)
||
null
const
requestComRef
=
this
.
$refs
.
requestCom
&&
(
this
.
$refs
.
requestCom
.
$refs
.
asCom
)
||
null
const
itemComRef
=
this
.
$refs
.
itemCom
&&
(
this
.
$refs
.
itemCom
.
$refs
.
asCom
)
||
{}
const
itemComRef
=
this
.
$refs
.
itemCom
&&
(
this
.
$refs
.
itemCom
.
$refs
.
asCom
)
||
{}
const
responseRef
=
this
.
$refs
.
responseTable
&&
(
this
.
$refs
.
responseTable
.
$refs
.
asCom
)
||
{}
requestComRef
&&
(
requestComRef
.
pagination
.
total
=
0
)
requestComRef
&&
(
requestComRef
.
pagination
.
total
=
0
)
itemComRef
&&
(
itemComRef
.
pagination
.
total
=
0
)
itemComRef
&&
(
itemComRef
.
pagination
.
total
=
0
)
responseRef
&&
(
responseRef
.
pagination
.
total
=
0
)
requestComRef
&&
(
requestComRef
.
showData
=
[])
requestComRef
&&
(
requestComRef
.
showData
=
[])
itemComRef
&&
(
itemComRef
.
showData
=
[])
itemComRef
&&
(
itemComRef
.
showData
=
[])
responseRef
&&
(
responseRef
.
showData
=
[])
},
800
)
},
800
)
}
}
}
}
...
...
applications/dee-mes/src/privateComponents/components/printTagForConfig/index.vue
View file @
e6c5b21f
...
@@ -103,6 +103,8 @@ export default {
...
@@ -103,6 +103,8 @@ export default {
this
.
printFlowLable
(
selection
)
this
.
printFlowLable
(
selection
)
}
else
if
(
selectSubTypeName
===
'Inventory'
)
{
// 打印移库标签
}
else
if
(
selectSubTypeName
===
'Inventory'
)
{
// 打印移库标签
this
.
printMoveLibraryLabel
(
selection
)
this
.
printMoveLibraryLabel
(
selection
)
}
else
if
(
selectSubTypeName
===
'JobResponseOutStorageMaterialUse'
)
{
// 打印材料领用出库标签
this
.
printJobResMaterialUseLabel
(
selection
)
}
else
if
(
selectSubTypeName
===
'JobResponseOutStorageMatch'
||
selectSubTypeName
===
'JobResponseOutStorageOut'
||
selectSubTypeName
===
'JobResponseOutStorageUse'
)
{
// 批量签审_配套出库响应打印标签||批量签审_供外出库响应打印标签||批量签审_领用出库响应打印标签
}
else
if
(
selectSubTypeName
===
'JobResponseOutStorageMatch'
||
selectSubTypeName
===
'JobResponseOutStorageOut'
||
selectSubTypeName
===
'JobResponseOutStorageUse'
)
{
// 批量签审_配套出库响应打印标签||批量签审_供外出库响应打印标签||批量签审_领用出库响应打印标签
this
.
printBatchSignMatchJob
(
selection
)
this
.
printBatchSignMatchJob
(
selection
)
}
else
if
(
selectSubTypeName
.
includes
(
'OutStorage'
))
{
// 打印出库标签
}
else
if
(
selectSubTypeName
.
includes
(
'OutStorage'
))
{
// 打印出库标签
...
@@ -400,6 +402,34 @@ export default {
...
@@ -400,6 +402,34 @@ export default {
})
})
this
.
print
()
this
.
print
()
},
},
printJobResMaterialUseLabel
(
selection
)
{
this
.
config
.
prints
=
[]
selection
.
forEach
((
row
)
=>
{
this
.
config
=
Object
.
assign
({},
this
.
config
,
{
visible
:
true
})
const
responseInventory
=
row
.
erpInventory
||
{}
this
.
config
.
prints
.
push
({
text
:
row
.
id
||
row
.
id
,
propertys
:
[
{
label
:
'编码'
,
value
:
responseInventory
.
extMaterial
.
resCode
},
{
label
:
'名称'
,
value
:
responseInventory
.
extMaterial
.
resName
},
{
label
:
'型号/牌号/件号'
,
value
:
responseInventory
.
extMaterial
.
modelNo
},
{
label
:
'规格'
,
value
:
responseInventory
.
extMaterial
.
spec
},
{
label
:
'批号'
,
value
:
responseInventory
.
batchNumber
},
{
label
:
'系列号/序列号'
,
value
:
responseInventory
.
serialNo
},
{
label
:
'机型'
,
value
:
responseInventory
.
airModel
},
{
label
:
'出库数量'
,
value
:
row
.
allocatedAmount
||
''
},
{
label
:
'验收单号'
,
value
:
responseInventory
.
testNo
},
{
label
:
'贮存期'
,
value
:
responseInventory
.
qualityPeriod
&&
responseInventory
.
qualityPeriod
.
replace
(
' 00:00:00'
,
''
)
},
{
label
:
'库位号'
,
value
:
responseInventory
.
workunit
||
''
},
{
label
:
'AO号'
,
value
:
responseInventory
.
erpOutRequest
&&
responseInventory
.
erpOutRequest
.
aoPlan
||
''
},
{
label
:
'备注'
,
value
:
row
.
remark
||
''
}
]
})
})
this
.
print
()
},
printOutStorageLabel
(
selection
)
{
printOutStorageLabel
(
selection
)
{
this
.
config
.
prints
=
[]
this
.
config
.
prints
=
[]
selection
.
forEach
((
row
)
=>
{
selection
.
forEach
((
row
)
=>
{
...
...
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