|
@@ -90,7 +90,6 @@ watch(
|
|
|
packingLaborSummary: res[i].skuSpecList[j].bomSpecList[y].packingLaborSummary,
|
|
|
managementFeeSummary: res[i].skuSpecList[j].bomSpecList[y].managementFeeSummary,
|
|
|
unitPriceSKU: res[i].skuSpecList[j].unitPrice,
|
|
|
- outerBoxPackingFee: res[i].outerBoxPackingFee,
|
|
|
total: res[i].total,
|
|
|
indexOne: indexOne,
|
|
|
indexTwo: indexTwo,
|
|
@@ -253,20 +252,14 @@ const columns = computed(() => {
|
|
|
width: 120,
|
|
|
},
|
|
|
{
|
|
|
- dataKey: "outerBoxPackingFee",
|
|
|
- key: "column-18",
|
|
|
- title: "外箱包装费",
|
|
|
- width: 120,
|
|
|
- },
|
|
|
- {
|
|
|
dataKey: "total",
|
|
|
- key: "column-19",
|
|
|
+ key: "column-18",
|
|
|
title: "合计",
|
|
|
width: 120,
|
|
|
},
|
|
|
];
|
|
|
});
|
|
|
-const mergeColumnOne = [0, 1, 2, 18, 19];
|
|
|
+const mergeColumnOne = [0, 1, 2, 18];
|
|
|
const mergeColumnTwo = [3, 4, 5, 16, 17];
|
|
|
const Row = ({ rowData, cells }) => {
|
|
|
if (rowData.indexOne > 1) {
|