Merge branch 'fix_foton_20240430' into 'master'
fix: 标准解读流程中的oldNumber使用三元表达式写法取值 See merge request laws-foton-slrs/foton-laws-system-front!194
This commit is contained in:
@@ -555,7 +555,7 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.oldNumber = data.oldNumber || data.form.oldNumber
|
||||
this.form.oldNumber = data.form ? data.form.oldNumber : data.oldNumber
|
||||
this.form.standId = data.standId || data.form.standId
|
||||
this.form.standInData = data.standInData || data.form.standInData
|
||||
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||
|
||||
@@ -539,7 +539,7 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.oldNumber = data.oldNumber || data.form.oldNumber
|
||||
this.form.oldNumber = data.form ? data.form.oldNumber : data.oldNumber
|
||||
this.form.standId = data.standId || data.form.standId
|
||||
this.form.standInData = data.standInData || data.form.standInData
|
||||
this.form.endTime = data.endTime || data.form.endTime
|
||||
|
||||
@@ -538,7 +538,7 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.oldNumber = data.oldNumber || data.form.oldNumber
|
||||
this.form.oldNumber = data.form ? data.form.oldNumber : data.oldNumber
|
||||
this.form.standId = data.standId || data.form.standId
|
||||
this.form.standInData = data.standInData || data.form.standInData
|
||||
this.form.endTime = data.endTime || data.form.endTime
|
||||
|
||||
@@ -538,7 +538,7 @@
|
||||
pId: this.pId
|
||||
},{},res=>{
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.oldNumber = data.oldNumber || data.form.oldNumber
|
||||
this.form.oldNumber = data.form ? data.form.oldNumber : data.oldNumber
|
||||
this.form.standId = data.standId || data.form.standId
|
||||
this.form.standInData = data.standInData || data.form.standInData
|
||||
this.form.endTime = data.endTime || data.form.endTime
|
||||
|
||||
@@ -538,7 +538,7 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.oldNumber = data.oldNumber || data.form.oldNumber
|
||||
this.form.oldNumber = data.form ? data.form.oldNumber : data.oldNumber
|
||||
this.form.standId = data.standId || data.form.standId
|
||||
this.form.standInData = data.standInData || data.form.standInData
|
||||
this.form.endTime = data.endTime || data.form.endTime
|
||||
|
||||
Reference in New Issue
Block a user