|
|
|
@ -116,15 +116,12 @@ export default { |
|
|
|
}, |
|
|
|
initNr(row){ |
|
|
|
if(this.$i18n.locale === 'zh_CN'){ |
|
|
|
debugger |
|
|
|
if(this.isJSON(row.jcnr)){ |
|
|
|
let nr = '' |
|
|
|
_.forEach(JSON.parse(row.jcnr),(o)=>{ |
|
|
|
nr+=o.name+':'+o.value+' ' |
|
|
|
let list = JSON.parse(row.jcnr) |
|
|
|
_.forEach(list,(o,index)=>{ |
|
|
|
nr+=o.name+':'+o.value+(index===list.length-1?'':';') |
|
|
|
}) |
|
|
|
if(nr!==''){ |
|
|
|
nr+='、' |
|
|
|
} |
|
|
|
return nr |
|
|
|
}else{ |
|
|
|
return row.jcnr |
|
|
|
@ -132,12 +129,10 @@ export default { |
|
|
|
}else{ |
|
|
|
if(this.isJSON(row.jcnrEn)){ |
|
|
|
let nr = '' |
|
|
|
_.forEach(JSON.parse(row.jcnrEn),(o)=>{ |
|
|
|
nr+=o.name+':'+o.name+' ' |
|
|
|
let list = JSON.parse(row.jcnrEn) |
|
|
|
_.forEach(list,(o,index)=>{ |
|
|
|
nr+=o.name+':'+o.value+(index===list.length-1?'':';') |
|
|
|
}) |
|
|
|
if(nr!==''){ |
|
|
|
nr+='、' |
|
|
|
} |
|
|
|
return nr |
|
|
|
}else{ |
|
|
|
return row.jcnrEn |
|
|
|
|