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

This commit is contained in:
super_liu
2021-08-09 18:02:04 +08:00
@@ -345,21 +345,33 @@ export default {
addList() { addList() {
dicTypeData().then(res => { dicTypeData().then(res => {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
}) standUnqualified(this.queryUnqualidiedData).then(res => {
standUnqualified(this.queryUnqualidiedData).then(res => { this.unqualidiedData = res.data.records
this.unqualidiedData = res.data.records this.unqualidiedData.forEach(item => {
this.unqualidiedData.forEach(item => { // 责任部门转换
this.$set(item,'engineer','') if (item.responsibleUnit !== null || item.responsibleUnit !== "") {
this.$set(item,'engineerId','') let k = (item.responsibleUnit || "").split(',')
this.$set(item,'dutyPeopleInfo','') for (let i in this.zrbmOptions) {
this.$set(item,'dutyPeople','') for (let m = 0; m< k.length; m++) {
this.$set(item,'dutyPeopleInfoId','') if (this.zrbmOptions[i].value === k[m]) {
this.$set(item,'dutyPeopleId','') k[m] = this.zrbmOptions[i].label
this.$set(item,'fileText',[]) }
this.$set(item,'fileTextId',[]) item.responsibleUnit = k.join(',')
this.$set(item,'fileTextPath',[]) }
}
}
this.$set(item,'engineer','')
this.$set(item,'engineerId','')
this.$set(item,'dutyPeopleInfo','')
this.$set(item,'dutyPeople','')
this.$set(item,'dutyPeopleInfoId','')
this.$set(item,'dutyPeopleId','')
this.$set(item,'fileText',[])
this.$set(item,'fileTextId',[])
this.$set(item,'fileTextPath',[])
})
this.total = res.data.total
}) })
this.total = res.data.total
}) })
this.standModel = true; this.standModel = true;
}, },