Commit c6a02181 authored by jingnan's avatar jingnan 👀

领用出库有指令与无指令修改

parent eccf3abe
...@@ -114,7 +114,7 @@ export default { ...@@ -114,7 +114,7 @@ export default {
}] }]
if (typeName === 'swapUse') { if (typeName === 'swapUse') {
data[0].extSupportingItemVO = this.selectDatas[0].extSupportingItemVO data[0].extSupportingItemVO = this.selectDatas[0].extSupportingItemVO
} else if (typeName === 'scrapUse' || typeName === 'useAO') { } else if (typeName === 'scrapUse') {
data[0].extSupportingItemVO = this.selection.extSupportingItemVO data[0].extSupportingItemVO = this.selection.extSupportingItemVO
data[0].extSupportingItemId = this.selection.extSupportingItemVO && this.selection.extSupportingItemVO.id data[0].extSupportingItemId = this.selection.extSupportingItemVO && this.selection.extSupportingItemVO.id
} }
......
...@@ -277,7 +277,7 @@ export default { ...@@ -277,7 +277,7 @@ export default {
data.forEach(item => { data.forEach(item => {
tableData.forEach(v => { tableData.forEach(v => {
let flag = v.extMaterialId === item.extMaterialId let flag = v.extMaterialId === item.extMaterialId
if (typeName === 'scrapUse' || typeName === 'useAO') { if (typeName === 'scrapUse') {
flag = v.extSupportingItemId === item.extSupportingItemId && v.extMaterialId === item.extMaterialId flag = v.extSupportingItemId === item.extSupportingItemId && v.extMaterialId === item.extMaterialId
} else { } else {
flag = v.extMaterialId === item.extMaterialId flag = v.extMaterialId === item.extMaterialId
......
...@@ -78,7 +78,7 @@ export default { ...@@ -78,7 +78,7 @@ export default {
this.tableColumnSelect = true this.tableColumnSelect = true
let requestUrl = 'ExtProcessPlan' let requestUrl = 'ExtProcessPlan'
let queryNo = 'serialNumber' let queryNo = 'serialNumber'
if (this.basicData.useRequestType === 'noAO') { if (this.basicData.useRequestType === 'noAO' || this.basicData.useRequestType === 'useAO') {
requestUrl = 'AbsentAO' // 无指令AbsentAO requestUrl = 'AbsentAO' // 无指令AbsentAO
queryNo = 'aoNo' queryNo = 'aoNo'
} else { } else {
......
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