Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -344,7 +344,7 @@
|
||||
this.form.title = data.title
|
||||
this.form.date = data.date
|
||||
this.json = data
|
||||
this.tableData = data.responUserListMap
|
||||
this.tableData = data.responUserList
|
||||
this.form.hzfileName = data.hzfileName
|
||||
this.form.hzfileId = data.hzfileId
|
||||
}).catch(e => {
|
||||
|
||||
@@ -344,7 +344,7 @@
|
||||
this.form.title = data.title
|
||||
this.form.date = data.date
|
||||
this.json = data
|
||||
this.tableData = data.responUserListMap
|
||||
this.tableData = data.responUserList
|
||||
this.form.hzfileName = data.hzfileName
|
||||
this.form.hzfileId = data.hzfileId
|
||||
}).catch(e => {
|
||||
|
||||
@@ -344,7 +344,7 @@
|
||||
this.form.title = data.title
|
||||
this.form.date = data.date
|
||||
this.json = data
|
||||
this.tableData = data.responUserListMap
|
||||
this.tableData = data.responUserList
|
||||
this.form.hzfileName = data.hzfileName
|
||||
this.form.hzfileId = data.hzfileId
|
||||
}).catch(e => {
|
||||
|
||||
@@ -344,7 +344,7 @@
|
||||
this.form.title = data.title
|
||||
this.form.date = data.date
|
||||
this.json = data
|
||||
this.tableData = data.responUserListMap
|
||||
this.tableData = data.responUserList
|
||||
this.form.hzfileName = data.hzfileName
|
||||
this.form.hzfileId = data.hzfileId
|
||||
}).catch(e => {
|
||||
|
||||
@@ -429,17 +429,19 @@ export default {
|
||||
},
|
||||
checkedRole (data) {
|
||||
if (this.type === 1) {
|
||||
this.dataList[this.zrIndex].liablePeopleId = data[0].id
|
||||
this.dataList[this.zrIndex].liablePeople = data[0].name
|
||||
this.$forceUpdate()
|
||||
const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]))
|
||||
newRow.liablePeopleId = data[0].id
|
||||
newRow.liablePeople = data[0].name
|
||||
this.$set(this.dataList, this.zrIndex, newRow)
|
||||
} else if(this.type === 2) {
|
||||
this.dataList.forEach( item => {
|
||||
this.dataList.forEach((item, index) => {
|
||||
this.selectList.forEach( items => {
|
||||
if (item.standId === items.standId) {
|
||||
item.liablePeopleId = data[0].id
|
||||
item.liablePeople = data[0].name
|
||||
const newRow = JSON.parse(JSON.stringify(item))
|
||||
newRow.liablePeopleId = data[0].id
|
||||
newRow.liablePeople = data[0].name
|
||||
this.$set(this.dataList, index, newRow)
|
||||
}
|
||||
this.$forceUpdate()
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user