Commit 214012c5 authored by jingnan's avatar jingnan 👀

打印标签获取AO号取值修改

parent 247efbb5
...@@ -192,8 +192,8 @@ export default { ...@@ -192,8 +192,8 @@ export default {
this.config.prints.push({ this.config.prints.push({
text: item.inJobResponseId || '', text: item.inJobResponseId || '',
propertys: [ propertys: [
{ label: '编码', value: item.materialName || '' }, { label: '编码', value: item.materialCode || '' },
{ label: '名称', value: item.materialCode || '' }, { label: '名称', value: item.materialName || '' },
{ {
label: '型号/牌号/件号', label: '型号/牌号/件号',
value: item.modelNo || '' value: item.modelNo || ''
...@@ -217,7 +217,7 @@ export default { ...@@ -217,7 +217,7 @@ export default {
label: '计量单位', label: '计量单位',
value: item.unit || '' value: item.unit || ''
}, },
{ label: 'AO号', value: item.seqNo && item.seqNo.split('-P') && item.seqNo.split('-P')[0] || '' }, { label: 'AO号', value: item.flowType === 'MatchOut' ? item.seqNo && item.seqNo.split('-P') && item.seqNo.split('-P')[0] || '' : item.inJobResponse && item.inJobResponse.jobOrder && item.inJobResponse.jobOrder.outStorageRequest && item.inJobResponse.jobOrder.outStorageRequest.aoNo },
{ label: '备注', value: item.remark || '' } { label: '备注', value: item.remark || '' }
] ]
}) })
...@@ -316,10 +316,12 @@ export default { ...@@ -316,10 +316,12 @@ export default {
label: '计量单位', value: jobOrderData.extMaterial.extUnit.unitName || '' }, label: '计量单位', value: jobOrderData.extMaterial.extUnit.unitName || '' },
{ {
label: 'AO号', label: 'AO号',
value: row.jobOrder && row.jobOrder.extSupportingItemVO && value: row.subTypeName === 'JobResponseOutStorageMatch' ? row.jobOrder && row.jobOrder.extSupportingItemVO &&
row.jobOrder.extSupportingItemVO.extSupporting && row.jobOrder.extSupportingItemVO.extSupporting &&
row.jobOrder.extSupportingItemVO.extSupporting.extProcessPlan && row.jobOrder.extSupportingItemVO.extSupporting.extProcessPlan &&
row.jobOrder.extSupportingItemVO.extSupporting.extProcessPlan.serialNumber row.jobOrder.extSupportingItemVO.extSupporting.extProcessPlan.serialNumber
: row.jobOrder.outStorageRequest &&
row.jobOrder.outStorageRequest.aoNo
}, },
// { // {
// label: '领用依据', // label: '领用依据',
...@@ -339,7 +341,7 @@ export default { ...@@ -339,7 +341,7 @@ export default {
printOutStorageLabel(selection) { printOutStorageLabel(selection) {
this.config.prints = [] this.config.prints = []
selection.forEach((row) => { selection.forEach((row) => {
const targetJobResponses = row.inventoryJobResponses.filter(item => item.subTypeName.includes('JobResponseOutStorage')) || [] const targetJobResponses = row.inventoryJobResponses && row.inventoryJobResponses.filter(item => item.subTypeName.includes('JobResponseOutStorage')) || []
targetJobResponses.forEach((response) => { targetJobResponses.forEach((response) => {
this.config = Object.assign({}, this.config, { this.config = Object.assign({}, this.config, {
visible: true visible: true
......
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