Commit eccf3abe authored by jingnan's avatar jingnan 👀

检验流程界面中,增加验收单号一列:当填写验收单号后,点击保存,回显到主界面中;

parent c6135f30
...@@ -145,6 +145,7 @@ export default { ...@@ -145,6 +145,7 @@ export default {
] ]
} }
}}, }},
{ title: '验收单编号', key: 'testTestNo', align: 'center', minWidth: '120', show: true, sortable: true },
{ title: '单据编号', key: 'inventoryReq.reqNo', width: '120', align: 'center', headerAlign: 'center' }, { title: '单据编号', key: 'inventoryReq.reqNo', width: '120', align: 'center', headerAlign: 'center' },
{ {
title: '库位', title: '库位',
...@@ -285,8 +286,10 @@ export default { ...@@ -285,8 +286,10 @@ export default {
] ]
if ((this.basicData.subTypeName === 'InStoragePurchaseItem' || this.basicData.subTypeName === 'InStorageRecallItem' || this.basicData.subTypeName === 'InStorageExpireItem') && this.basicData.state === 'In_Confirm') { if ((this.basicData.subTypeName === 'InStoragePurchaseItem' || this.basicData.subTypeName === 'InStorageRecallItem' || this.basicData.subTypeName === 'InStorageExpireItem') && this.basicData.state === 'In_Confirm') {
return tableConlumn return tableConlumn
} else { } else if (this.basicData.state === 'Material_Check') {
return tableConlumn.filter(item => item.title !== '库位') return tableConlumn.filter(item => item.title !== '库位')
} else {
return tableConlumn.filter(item => item.title !== '库位' && item.title !== '验收单编号')
} }
} }
}, },
...@@ -458,9 +461,13 @@ export default { ...@@ -458,9 +461,13 @@ export default {
tableData.forEach((item, i) => { tableData.forEach((item, i) => {
item.parentIndex = i + 1 item.parentIndex = i + 1
const targetInventory = this.$utils.getTargetJobResponses(item, 'JobResponseInEntry') const targetInventory = this.$utils.getTargetJobResponses(item, 'JobResponseInEntry')
const testJobResponse = this.$utils.getTargetJobResponses(item, 'JobResponseInTest')
if (targetInventory) { if (targetInventory) {
item.exWorkUnitName = targetInventory.extWorkUnit && targetInventory.extWorkUnit.extcode || '' item.exWorkUnitName = targetInventory.extWorkUnit && targetInventory.extWorkUnit.extcode || ''
} }
if (testJobResponse) {
item.testTestNo = testJobResponse.testNo
}
if (item.children) { if (item.children) {
item.children.forEach((child, j) => { item.children.forEach((child, j) => {
child.parentIndex = item.parentIndex + '.' + (j + 1) child.parentIndex = item.parentIndex + '.' + (j + 1)
......
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