合并分支 'dev_20230216' 到 'master'

修改历史版本

查看合并请求 laws-foton-slrs/foton-laws-system-front!63
This commit is contained in:
高嵩
2023-04-19 20:59:15 +08:00
@@ -2729,6 +2729,9 @@
textArr2 = [...new Set(textArr2)] textArr2 = [...new Set(textArr2)]
this.replaceLawsNumModel = false this.replaceLawsNumModel = false
}) })
this.form.rqbJson = this.selectedListRep[0].id
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖 // 解决 标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖
if (this.replaceLawType === 'DTQBBHBUSS') { if (this.replaceLawType === 'DTQBBHBUSS') {
@@ -3523,7 +3526,7 @@
// this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName); // this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
// } // }
if (res && res.data && res.data[0].fbgbuss !== '') { if (res && res.data && res.data[0].fbgbuss !== '') {
this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{ const names = res.data.reduce((init,item,index,arr)=>{
if(index === 0){ if(index === 0){
init = item.fbgbussNmae init = item.fbgbussNmae
}else{ }else{
@@ -3531,7 +3534,7 @@
} }
return init return init
},'') },'')
this.form.LSBBBUSS = res.data.reduce((init,item,index,arr)=>{ const ids = res.data.reduce((init,item,index,arr)=>{
if(index === 0){ if(index === 0){
init = item.fbgbuss init = item.fbgbuss
}else{ }else{
@@ -3539,6 +3542,15 @@
} }
return init return init
},'') },'')
if(this.form.LSBBBUSSName === undefined || this.form.LSBBBUSSName.indexOf(names) === -1){
if(this.form.LSBBBUSSName === undefined){
this.form.LSBBBUSSName = names
this.form.LSBBBUSS = ids
}else{
this.form.LSBBBUSSName = names + ',' + this.form.LSBBBUSSName
this.form.LSBBBUSS = ids + ',' + this.form.LSBBBUSS
}
}
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName); this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
} }
}) })