|
@ -86,6 +86,7 @@ export default { |
|
|
"ContrastOrderResponse-SalesOrder", |
|
|
"ContrastOrderResponse-SalesOrder", |
|
|
"ContrastOrderResponse-ContractDeliveryDate", |
|
|
"ContrastOrderResponse-ContractDeliveryDate", |
|
|
"ContrastOrderResponse-DemandWeek", |
|
|
"ContrastOrderResponse-DemandWeek", |
|
|
|
|
|
"ContrastOrderResponse-ExpectedWeek", |
|
|
"ContrastOrderResponse-OrderId", |
|
|
"ContrastOrderResponse-OrderId", |
|
|
"ContrastOrderResponse-Article", |
|
|
"ContrastOrderResponse-Article", |
|
|
"ContrastOrderResponse-Desc", |
|
|
"ContrastOrderResponse-Desc", |
|
@ -110,7 +111,7 @@ export default { |
|
|
methods: { |
|
|
methods: { |
|
|
// 合并单元格 |
|
|
// 合并单元格 |
|
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) { |
|
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) { |
|
|
if (columnIndex < 10) { |
|
|
|
|
|
|
|
|
if (columnIndex < this.headers.length) { |
|
|
const _row = this.mergeArray[rowIndex] |
|
|
const _row = this.mergeArray[rowIndex] |
|
|
const _col = _row > 0 ? 1 : 0; |
|
|
const _col = _row > 0 ? 1 : 0; |
|
|
return { |
|
|
return { |
|
|