|
|
@ -836,11 +836,20 @@ const handleData = async () => { |
|
|
|
comparisonValue = value.waybillNo; |
|
|
|
comparisonValue = value.waybillNo; |
|
|
|
handleMerge(mergeStartIndex, index, _data); |
|
|
|
handleMerge(mergeStartIndex, index, _data); |
|
|
|
mergeStartIndex = index; |
|
|
|
mergeStartIndex = index; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (index === _data.length - 1) { |
|
|
|
|
|
|
|
handleMerge(mergeStartIndex, index + 1, _data); |
|
|
|
|
|
|
|
} |
|
|
|
// 最后一位特殊处理 |
|
|
|
// 最后一位特殊处理 |
|
|
|
} else if (index === _data.length - 1) handleMerge(mergeStartIndex, index + 1, _data); |
|
|
|
} else if (index === _data.length - 1) { |
|
|
|
|
|
|
|
handleMerge(mergeStartIndex, index + 1, _data); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
console.log('_data :>> ', _data); |
|
|
|
|
|
|
|
|
|
|
|
details.renderData = _data; |
|
|
|
details.renderData = _data; |
|
|
|
|
|
|
|
console.log('details.renderData :>> ', details.renderData); |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
/** 表格表头输入框搜索 */ |
|
|
|
/** 表格表头输入框搜索 */ |
|
|
|