Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhutianqi
2021-08-06 17:22:55 +08:00
5 changed files with 13 additions and 11 deletions
@@ -344,7 +344,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
}).catch(e => { }).catch(e => {
@@ -344,7 +344,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
}).catch(e => { }).catch(e => {
@@ -344,7 +344,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
}).catch(e => { }).catch(e => {
@@ -344,7 +344,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
}).catch(e => { }).catch(e => {
@@ -429,17 +429,19 @@ export default {
}, },
checkedRole (data) { checkedRole (data) {
if (this.type === 1) { if (this.type === 1) {
this.dataList[this.zrIndex].liablePeopleId = data[0].id const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]))
this.dataList[this.zrIndex].liablePeople = data[0].name newRow.liablePeopleId = data[0].id
this.$forceUpdate() newRow.liablePeople = data[0].name
this.$set(this.dataList, this.zrIndex, newRow)
} else if(this.type === 2) { } else if(this.type === 2) {
this.dataList.forEach( item => { this.dataList.forEach((item, index) => {
this.selectList.forEach( items => { this.selectList.forEach( items => {
if (item.standId === items.standId) { if (item.standId === items.standId) {
item.liablePeopleId = data[0].id const newRow = JSON.parse(JSON.stringify(item))
item.liablePeople = data[0].name newRow.liablePeopleId = data[0].id
newRow.liablePeople = data[0].name
this.$set(this.dataList, index, newRow)
} }
this.$forceUpdate()
}) })
}) })
} }