|
|
@@ -647,6 +647,7 @@ export default class ApprovalAdd extends Component {
|
|
|
}
|
|
|
let dataStr = response.data
|
|
|
let dataList = JSON.parse(dataStr)
|
|
|
+ let dbColumns = response.columns
|
|
|
if (isObjEmpty(dataList)) {
|
|
|
message.warn('选项数据为空')
|
|
|
return
|
|
|
@@ -670,10 +671,16 @@ export default class ApprovalAdd extends Component {
|
|
|
let localData = new LocalData()
|
|
|
localData.name = item[fieldKeyLike]
|
|
|
let jsonMap = {}
|
|
|
+ let jsonMapV = {}
|
|
|
for (let key in configMap) {
|
|
|
jsonMap[configMap[key]] = item[key]
|
|
|
+ dbColumns.forEach((col, index) => {
|
|
|
+ if(col.dataIndex == key && col.width > 0){
|
|
|
+ jsonMapV[configMap[key]] = item[key]
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
- localData.value = this.getShowValue(jsonMap)
|
|
|
+ localData.value = this.getShowValue(jsonMapV)
|
|
|
localData.obj = jsonMap
|
|
|
dbList.push(localData)
|
|
|
})
|