Commit 5b6d5f26 authored by jingnan's avatar jingnan 👀

验收入库确认打印标签修改

parent adef43e6
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
let JobResponseInStorageEntryId = '' let JobResponseInStorageEntryId = ''
// 打印标签二维码扫描结果展示入库响应的id // 打印标签二维码扫描结果展示入库响应的id
if (row.inventoryJobResponses && row.inventoryJobResponses.length) { if (row.inventoryJobResponses && row.inventoryJobResponses.length) {
const entryResponse = row.inventoryJobResponses.find(el => el.subTypeName === 'JobResponseInEntry' || el.subTypeName.includes('JobResponseOutStorage')) const entryResponse = row.inventoryJobResponses.find(el => el.subTypeName === 'JobResponseInEntry')
entryResponse && (JobResponseInStorageEntryId = entryResponse.id) entryResponse && (JobResponseInStorageEntryId = entryResponse.id)
} }
this.config.prints.push({ this.config.prints.push({
...@@ -141,8 +141,8 @@ export default { ...@@ -141,8 +141,8 @@ export default {
{ label: '批号', value: row.lotNo }, { label: '批号', value: row.lotNo },
{ label: '系列号/序列号', value: row.serialNo }, { label: '系列号/序列号', value: row.serialNo },
{ label: '机型', value: row.airModel }, { label: '机型', value: row.airModel },
{ label: '验收单号', value: row.inventory && row.inventory.testNo }, { label: '验收单号', value: row.inventory && row.inventory.testNo || row.testNo || '' },
{ label: '库位号', value: row.inventory && row.inventory.workunit || '' }, { label: '库位号', value: row.inventory && row.inventory.workunit || row.extWorkUnitCode || '' },
{ label: '备注', value: row.remark || '' } { label: '备注', value: row.remark || '' }
] ]
}) })
......
...@@ -11,19 +11,15 @@ ...@@ -11,19 +11,15 @@
:basic-data=" { selectData,selectionRows }" :basic-data=" { selectData,selectionRows }"
:lay-config="{ typeName: 'InStorageRequestItem', layKey: 'batchSign_warehouseConfirm'}" :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'batchSign_warehouseConfirm'}"
@selectionChange="selectionChange" @selectionChange="selectionChange"
@tableToolHandler="tableToolHandler"
/> />
<!-- 打印标签 -->
<PrintTag ref="print" :config="printConfig" />
</div> </div>
</template> </template>
<script> <script>
import PrintTag from '@/../../dee-mes/src/privateComponents/components/WarehousingConfirmationConfirm/component/PrintTag.vue'
export default { export default {
name: 'WarehouseConfirm', name: 'WarehouseConfirm',
components: { PrintTag }, components: {},
props: { props: {
selectData: { selectData: {
type: Object, type: Object,
...@@ -32,13 +28,7 @@ export default { ...@@ -32,13 +28,7 @@ export default {
}, },
data() { data() {
return { return {
selectionRows: [], selectionRows: []
// 打印标签
printConfig: {
visible: false,
width: 300,
prints: []
}
} }
}, },
computed: {}, computed: {},
...@@ -49,41 +39,6 @@ export default { ...@@ -49,41 +39,6 @@ export default {
methods: { methods: {
selectionChange(val) { selectionChange(val) {
this.selectionRows = val this.selectionRows = val
},
tableToolHandler(val) {
if (val.key.btnValue === 'print') {
this.print()
}
},
print() {
// 获取需要打印的数据
this.printConfig.prints = []
let JobResponseInStorageEntryId = ''
this.selectionRows.forEach((row) => {
this.$message.closeAll()
JobResponseInStorageEntryId = row.extWorkUnit.extcode
this.printConfig = Object.assign({}, this.printConfig, {
visible: true
})
this.printConfig.prints.push({
text: JobResponseInStorageEntryId,
propertys: [
{ label: '编码', value: row.jobOrder.extMaterial.resCode },
{ label: '名称', value: row.jobOrder.extMaterial.resName },
{ label: '型号/牌号/件号', value: row.jobOrder.extMaterial.modelNo },
{ label: '规格', value: row.jobOrder.extMaterial.spec },
{ label: '批号', value: row.jobOrder.lotNo },
{ label: '系列号/序列号', value: row.jobOrder.serialNo },
{ label: '机型', value: row.jobOrder.airModel },
{ label: '验收单号', value: row.testNo },
{ label: '库位号', value: row.extWorkUnit.extcode || '' },
{ label: '备注', value: row.jobOrder.remark || '' }
]
})
})
// 打印操作
this.$refs.print.print()
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment