Commit e7d62222 by zhuxiaomei

赋值的问题

parent a002b6c6
......@@ -1131,7 +1131,7 @@
},
_scanResult(result) {
for (let key in this.sample) {
if (result[key]!=='') {
if (result[key] !== '') {
if (key === 'sampleDate') {
this.sample[key] = result[key] ? this.$dateformat(result[key], 'yyyy-mm-dd') : ''
} else if (key === 'storageCondition') {
......@@ -1209,7 +1209,7 @@
let result = await samplingSummary.getById(this.id)
if (result) {
for (let key in this.formObj) {
if (result[key]!=='') {
if (result[key] !== '') {
if (key === 'samplingDate') {
this.formObj[key] = result[key] ? this.$dateformat(result[key], 'yyyy-mm-dd') : ''
} else {
......@@ -1218,12 +1218,27 @@
}
}
for (let key in this.nonNetTested) {
if (result.nonNetTested[key]!=='') {
if (result.nonNetTested[key] !== '') {
if (key === 'placeLink') {
this.place = result.nonNetTested.placeLink + ',' + result.nonNetTested.place
switch (result.nonNetTested.placeLink) {
case '1':
this.placeRemark1 = result.nonNetTested.placeRemark ? result.nonNetTested.placeRemark : ''
break
case '2':
this.placeRemark2 = result.nonNetTested.placeRemark ? result.nonNetTested.placeRemark : ''
break
case '3':
this.placeRemark3 = result.nonNetTested.placeRemark ? result.nonNetTested.placeRemark : ''
break
}
} else {
this.nonNetTested[key] = result.nonNetTested[key]
}
}
}
for (let key in this.sample) {
if (result.sample[key]!=='') {
if (result.sample[key] !== '') {
if (key === 'sampleDate') {
this.sample[key] = result.sample[key] ? this.$dateformat(result.sample[key], 'yyyy-mm-dd') : ''
} else if (key === 'storageCondition') {
......@@ -1271,13 +1286,13 @@
data.nonNetTested.placeLink = this.place.split(',')[0]
data.nonNetTested.place = this.place.split(',')[1]
switch (data.nonNetTested.placeLink) {
case 1:
case '1':
data.nonNetTested.placeRemark = this.placeRemark1
break
case 2:
case '2':
data.nonNetTested.placeRemark = this.placeRemark2
break
case 3:
case '3':
data.nonNetTested.placeRemark = this.placeRemark3
break
}
......
......@@ -1157,9 +1157,13 @@
}
for (let key in this.netTested) {
if (result.netTested[key]!=='') {
if (key === 'placeLink') {
this.place = result.netTested.placeLink + ',' + result.netTested.place
} else {
this.netTested[key] = result.netTested[key]
}
}
}
for (let key in this.sample) {
if (result.sample[key]!=='') {
if (key === 'sampleDate') {
......
......@@ -964,9 +964,24 @@
}
for(let key in this.nonNetTested){
if(result.nonNetTested[key]!==''){
if (key === 'placeLink') {
this.place = result.nonNetTested.placeLink + ',' + result.nonNetTested.place
switch (result.nonNetTested.placeLink) {
case '1':
this.placeRemark1 = result.nonNetTested.placeRemark ? result.nonNetTested.placeRemark : ''
break
case '2':
this.placeRemark2 = result.nonNetTested.placeRemark ? result.nonNetTested.placeRemark : ''
break
case '3':
this.placeRemark3 = result.nonNetTested.placeRemark ? result.nonNetTested.placeRemark : ''
break
}
} else {
this.nonNetTested[key] = result.nonNetTested[key]
}
}
}
for(let key in this.sample){
if(result.sample[key]!==''){
if (key === 'sampleDate') {
......
......@@ -942,9 +942,13 @@
}
for (let key in this.netTested) {
if (result.netTested[key]!=='') {
if (key === 'placeLink') {
this.place = result.netTested.placeLink + ',' + result.netTested.place
} else {
this.netTested[key] = result.netTested[key]
}
}
}
for (let key in this.sample) {
if (result.sample[key]!=='') {
if (key === 'sampleDate') {
......
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