对账单增加外箱包装费

src/views/group/finance/check-bill/printOrder.vue

@@ -33,12 +33,8 @@ const getAggregate = (data) => {
   let total = 0;
   if (data && data.length > 0) {
     for (let i = 0; i < data.length; i++) {
-      if (data[i].skuSpecList && data[i].skuSpecList.length > 0) {
-        for (let j = 0; j < data[i].skuSpecList.length; j++) {
-          if (data[i].skuSpecList[j].total) {
-            total = Number(Math.round((total + data[i].skuSpecList[j].total) * 100) / 100);
-          }
-        }
+      if (data[i].total) {
+        total = Number(Math.round((total + data[i].total) * 100) / 100);
       }
     }
   }
@@ -77,7 +73,6 @@ onMounted(() => {
                       skuSpecName: res[i].skuSpecList[j].skuSpecName,
                       quantitySKU: res[i].skuSpecList[j].quantity,
                       subtotal: res[i].skuSpecList[j].subtotal,
-                      total: res[i].skuSpecList[j].total,
                       bomSpecCode: res[i].skuSpecList[j].bomSpecList[y].bomSpecCode,
                       bomSpecName: res[i].skuSpecList[j].bomSpecList[y].bomSpecName,
                       quantityBOM: res[i].skuSpecList[j].bomSpecList[y].quantity,
@@ -89,6 +84,8 @@ onMounted(() => {
                       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,
                     });
@@ -235,15 +232,21 @@ const columns = computed(() => {
       width: 120,
     },
     {
-      dataKey: "total",
+      dataKey: "outerBoxPackingFee",
       key: "column-18",
+      title: "外箱包装费",
+      width: 120,
+    },
+    {
+      dataKey: "total",
+      key: "column-19",
       title: "合计",
       width: 120,
     },
   ];
 });
-const mergeColumnOne = [0, 1, 2];
-const mergeColumnTwo = [3, 4, 5, 16, 17, 18];
+const mergeColumnOne = [0, 1, 2, 18, 19];
+const mergeColumnTwo = [3, 4, 5, 16, 17];
 const Row = ({ rowData, cells }) => {
   if (rowData.indexOne > 1) {
     for (let i = 0; i < mergeColumnOne.length; i++) {

src/views/group/finance/summary/printOrder.vue

@@ -33,19 +33,15 @@ const getAggregate = (data) => {
   let total = 0;
   if (data && data.length > 0) {
     for (let i = 0; i < data.length; i++) {
-      if (data[i].skuSpecList && data[i].skuSpecList.length > 0) {
-        for (let j = 0; j < data[i].skuSpecList.length; j++) {
-          if (data[i].skuSpecList[j].total) {
-            total = Number(Math.round((total + data[i].skuSpecList[j].total) * 100) / 100);
-          }
-        }
+      if (data[i].total) {
+        total = Number(Math.round((total + data[i].total) * 100) / 100);
       }
     }
   }
   return total;
 };
 onMounted(() => {
-  if (props.rowData.idGroupConcat) {
+  if (props.rowData && props.rowData.idGroupConcat) {
     loading.value = true;
     proxy.post("/statementOfAccountMerge/getDocumentByOrder", { idGroupConcat: props.rowData.idGroupConcat }).then(
       (res) => {
@@ -77,7 +73,6 @@ onMounted(() => {
                       skuSpecName: res[i].skuSpecList[j].skuSpecName,
                       quantitySKU: res[i].skuSpecList[j].quantity,
                       subtotal: res[i].skuSpecList[j].subtotal,
-                      total: res[i].skuSpecList[j].total,
                       bomSpecCode: res[i].skuSpecList[j].bomSpecList[y].bomSpecCode,
                       bomSpecName: res[i].skuSpecList[j].bomSpecList[y].bomSpecName,
                       quantityBOM: res[i].skuSpecList[j].bomSpecList[y].quantity,
@@ -89,6 +84,8 @@ onMounted(() => {
                       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,
                     });
@@ -241,15 +238,21 @@ const columns = computed(() => {
       width: 120,
     },
     {
-      dataKey: "total",
+      dataKey: "outerBoxPackingFee",
       key: "column-18",
+      title: "外箱包装费",
+      width: 120,
+    },
+    {
+      dataKey: "total",
+      key: "column-19",
       title: "合计",
       width: 120,
     },
   ];
 });
-const mergeColumnOne = [0, 1, 2];
-const mergeColumnTwo = [3, 4, 5, 16, 17, 18];
+const mergeColumnOne = [0, 1, 2, 18, 19];
+const mergeColumnTwo = [3, 4, 5, 16, 17];
 const Row = ({ rowData, cells }) => {
   if (rowData.indexOne > 1) {
     for (let i = 0; i < mergeColumnOne.length; i++) {

src/views/group/finance/summary/printSKU.vue

@@ -39,7 +39,7 @@ const props = defineProps({
 const loading = ref(false);
 const tableData = ref([]);
 onMounted(() => {
-  if (props.rowData.idGroupConcat) {
+  if (props.rowData && props.rowData.idGroupConcat) {
     loading.value = true;
     proxy.post("/statementOfAccountMerge/getDocumentBySku", { idGroupConcat: props.rowData.idGroupConcat }).then(
       (res) => {