|
|
@@ -717,8 +717,10 @@ class Approval extends Component {
|
|
|
})
|
|
|
} else {
|
|
|
detailList.forEach((showModel, index) => {
|
|
|
- if (showModel.valuesKey in dataObj) {
|
|
|
- showModel.values = dataObj[showModel.valuesKey]
|
|
|
+ if(selectModel.rowIndex == index) {
|
|
|
+ if (showModel.valuesKey in dataObj) {
|
|
|
+ showModel.values = dataObj[showModel.valuesKey]
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
@@ -1201,7 +1203,7 @@ class Approval extends Component {
|
|
|
|
|
|
let mainApproval = this.analysisFormdata(changeData['change-new'],
|
|
|
formdata,
|
|
|
- formconfigs, mApprovalRecord.caller, true, true)
|
|
|
+ formconfigs, mApprovalRecord.caller, true, true, 0)
|
|
|
|
|
|
mMainList = mMainList.concat(mainApproval)
|
|
|
}
|
|
|
@@ -1212,11 +1214,11 @@ class Approval extends Component {
|
|
|
if (!isObjNull(gridconfigs) && gridconfigs.length > 0) {
|
|
|
if (isObjNull(griddatas) || griddatas.length == 0) {
|
|
|
this.analysisFormdata(null, null, gridconfigs,
|
|
|
- mApprovalRecord.caller, false, true)
|
|
|
+ mApprovalRecord.caller, false, true, 0)
|
|
|
} else {
|
|
|
for (let i = 0; i < griddatas.length; i++) {
|
|
|
let detailedApproval = this.analysisFormdata(null, griddatas[i],
|
|
|
- gridconfigs, mApprovalRecord.caller, false, i == 0)
|
|
|
+ gridconfigs, mApprovalRecord.caller, false, i == 0, i)
|
|
|
if (!isObjNull(detailedApproval) && detailedApproval.length >
|
|
|
0) {
|
|
|
let approval = new ApprovalBean(ApprovalBean.TAG)
|
|
|
@@ -1256,7 +1258,7 @@ class Approval extends Component {
|
|
|
//获取到单个明细表单
|
|
|
let detailedApproval = this.analysisFormdata(null,
|
|
|
otherGriddata[j],
|
|
|
- otherGridconfigs, caller, false, false)
|
|
|
+ otherGridconfigs, caller, false, false, j)
|
|
|
if (!isObjEmpty(detailedApproval)) {
|
|
|
let approval = new ApprovalBean(ApprovalBean.TAG)
|
|
|
approval.caption = (j == 0 ? (name + ' 明细') : '')
|
|
|
@@ -1779,7 +1781,7 @@ class Approval extends Component {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- analysisFormdata = (changeData, data, configs, caller, isMain, addHint) => {
|
|
|
+ analysisFormdata = (changeData, data, configs, caller, isMain, addHint, rowIndex) => {
|
|
|
let approvalList = []
|
|
|
|
|
|
let idTag = ''
|
|
|
@@ -1815,6 +1817,7 @@ class Approval extends Component {
|
|
|
approval.dfType = type
|
|
|
approval.caption = caption
|
|
|
approval.valuesKey = valueKey
|
|
|
+ approval.rowIndex = rowIndex
|
|
|
|
|
|
let showAble = ((!isObjNull(data)) && data.hasOwnProperty(valueKey))
|
|
|
let values = getStrValue(data, valueKey)
|