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

# Conflicts:
#	src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
This commit is contained in:
fanlin
2021-07-19 17:39:52 +08:00
50 changed files with 826 additions and 393 deletions
@@ -3607,50 +3607,51 @@ export default {
const data = this.formFieldListData
this.formFieldList = data.map((item) => {
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
if(item.attrField === 'WSSMR'){
const options = [
{label:"署名人1",value:"1"},{label:"署名人2",value:"2"}
]
return Object.assign({}, item, {
options: options
})
}else if(item.attrField === 'CYSD'){
if(item.attrField === 'WSSMR'){
return Object.assign({}, item, {
options: this.allSelectOptions["WSSMR"]
})
}else if(item.attrField === 'QCDW'){
return Object.assign({}, item, {
options: this.allSelectOptions["QCDW"]
})
}else if(item.attrField === 'CYSD'){
return Object.assign({}, item, {
options: this.allSelectOptions["WSCYSD"]
})
}else if(item.attrField === 'CLLX'){
return Object.assign({}, item, {
options: this.allSelectOptions["ENERGYTYPES"]
})
}else if(item.attrField === 'NYLX'){
return Object.assign({}, item, {
options: this.allSelectOptions["NYLXCLASS"]
})
}else if(item.attrField === 'SYCPX'){
return Object.assign({}, item, {
options: this.allSelectOptions["SYCPXCLASS"]
})
}else if(item.attrField === 'SYRZ'){
return Object.assign({}, item, {
options: this.allSelectOptions["SYRZCLASS"]
})
}else if(item.attrField === 'ZRBM'){
return Object.assign({}, item, {
options: this.allSelectOptions["ZRBMCLASS"]
})
}else if(item.attrField === 'ZRGCS'){
return Object.assign({}, item, {
options: this.allSelectOptions["ZRGCSCLASS"]
})
}else if(item.attrField === 'TXLB'){
return Object.assign({}, item, {
options: this.allSelectOptions["TXLBCLASS"]
})
}else {
return Object.assign({}, item, {
options: this.allSelectOptions[item.selVal]
})
}
}else if(item.attrField === 'CLLX'){
return Object.assign({}, item, {
options: this.allSelectOptions["ENERGYTYPES"]
})
}else if(item.attrField === 'NYLX'){
return Object.assign({}, item, {
options: this.allSelectOptions["NYLXCLASS"]
})
}else if(item.attrField === 'SYCPX'){
return Object.assign({}, item, {
options: this.allSelectOptions["SYCPXCLASS"]
})
}else if(item.attrField === 'SYRZ'){
return Object.assign({}, item, {
options: this.allSelectOptions["SYRZCLASS"]
})
}else if(item.attrField === 'ZRBM'){
return Object.assign({}, item, {
options: this.allSelectOptions["ZRBMCLASS"]
})
}else if(item.attrField === 'ZRGCS'){
return Object.assign({}, item, {
options: this.allSelectOptions["ZRGCSCLASS"]
})
}else if(item.attrField === 'TXLB'){
return Object.assign({}, item, {
options: this.allSelectOptions["TXLBCLASS"]
})
}else {
return Object.assign({}, item, {
options: this.allSelectOptions[item.selVal]
})
}
} else {
return item
}