合并分支 'fix_foton' 到 'FOTON'

Fix foton

查看合并请求 laws-foton-slrs/foton-laws-system-front!4
This commit is contained in:
陈栋
2022-12-09 16:45:09 +08:00
@@ -786,7 +786,8 @@ export default {
})
},
saveUserInfo2 () {
if (this.PLmodalType === 1) {
// 确定按钮
if (this.PLmodalType === 1) { // 单个编辑
const row = JSON.parse(JSON.stringify(this.itemList[this.PLmodalIndex]))
row.technicalRequir = this.plForm.technicalRequir
row.changePoint = this.plForm.changePoint
@@ -800,13 +801,13 @@ export default {
for (let a = 0; a < this.itemList.length; a++) {
for (let b = 0; b < this.zrIdList.length; b++) {
if (this.itemList[a].id === this.zrIdList[b]) {
this.itemList[a].technicalRequir = this.plForm.technicalRequir
this.itemList[a].changePoint = this.plForm.changePoint
this.itemList[a].newData = this.plForm.newData
this.itemList[a].onlineData = this.plForm.onlineData
this.itemList[a].applyArctic = this.plForm.applyArctic
this.itemList[a].zrUserId = this.plForm.zrUserId
this.itemList[a].zrUserName = this.plForm.zrUserName
this.itemList[a].technicalRequir = this.plForm.technicalRequir === '' ? this.itemList[a].technicalRequir : this.plForm.technicalRequir
this.itemList[a].changePoint = this.plForm.changePoint === '' ? this.itemList[a].changePoint : this.plForm.changePoint
this.itemList[a].newData = this.plForm.newData === '' ? this.itemList[a].newData : this.plForm.newData
this.itemList[a].onlineData = this.plForm.onlineData === '' ? this.itemList[a].onlineData : this.plForm.onlineData
this.itemList[a].applyArctic = this.plForm.applyArctic.length===0 ? this.itemList[a].applyArctic : this.plForm.applyArctic
this.itemList[a].zrUserId = this.plForm.zrUserId === '' ? this.itemList[a].zrUserId : this.plForm.zrUserId
this.itemList[a].zrUserName = this.plForm.zrUserName === '' ? this.itemList[a].zrUserName : this.plForm.zrUserName
}
}
}