1

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

@@ -17,7 +17,8 @@
           <el-table-column label="快递包材费汇总" align="center" prop="deliveryMaterialsFeeSummary" width="130" />
           <el-table-column label="包装人工费汇总" align="center" prop="packingLaborSummary" width="130" />
           <el-table-column label="管理费汇总" align="center" prop="managementFeeSummary" width="130" />
-          <el-table-column label="打样费" align="center" prop="proofingFeeSummary" width="100" />
+          <el-table-column label="打样费" align="center" prop="proofingFeeSummary" width="100" v-if="tabValues.tabsCard != 4" />
+          <el-table-column label="质检费" align="center" prop="checkFeeSummary" width="100" v-else />
           <el-table-column label="小计" align="center" width="120">
             <template #default="{ row }">
               {{ moneyFormat(row.subtotal) }}
@@ -87,7 +88,7 @@ const labelList = ref({
   7: "deliveryMaterialsFeeSummary",
   8: "packingLaborSummary",
   9: "managementFeeSummary",
-  10: "proofingFeeSummary",
+  10: props.tabValues.tabsCard != 4 ? "proofingFeeSummary" : "checkFeeSummary",
   11: "subtotal",
   12: "total",
 });
@@ -186,7 +187,12 @@ const getSummaries = ({ columns, data }) => {
   return sums;
 };
 const getTotal = (label) => {
-  let list = tableData.value.map((item) => item[label]);
+  let list = [];
+  if (props.tabValues.tabsCard === 4 && label === "proofingFeeSummary") {
+    list = tableData.value.map((item) => item["checkFeeSummary"]);
+  } else {
+    list = tableData.value.map((item) => item[label]);
+  }
   return Number(Math.round(list.reduce((acc, curr) => acc + curr, 0) * 100) / 100);
 };
 const emit = defineEmits(["clickCancel"]);

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

@@ -93,6 +93,7 @@ watch(
                           managementFeeSummary: res[i].skuSpecList[j].bomSpecList[y].managementFeeSummary,
                           proofingFeeSummary: res[i].skuSpecList[j].bomSpecList[y].proofingFeeSummary,
                           unitPriceSKU: res[i].skuSpecList[j].unitPrice,
+                          checkFee: res[i].skuSpecList[j].checkFee,
                           total: res[i].total,
                           indexOne: indexOne,
                           indexTwo: indexTwo,
@@ -257,21 +258,27 @@ const columns = computed(() => {
       width: 100,
     },
     {
-      dataKey: "subtotal",
+      dataKey: "checkFee",
       key: "column-18",
+      title: "质检费",
+      width: 100,
+    },
+    {
+      dataKey: "subtotal",
+      key: "column-19",
       title: "小计",
       width: 120,
     },
     {
       dataKey: "total",
-      key: "column-19",
+      key: "column-20",
       title: "合计",
       width: 120,
     },
   ];
 });
-const mergeColumnOne = [0, 1, 2, 19];
-const mergeColumnTwo = [3, 4, 5, 17, 18];
+const mergeColumnOne = [0, 1, 2, 20];
+const mergeColumnTwo = [3, 4, 5, 17, 18, 19];
 const Row = ({ rowData, cells }) => {
   if (rowData.indexOne > 1) {
     for (let i = 0; i < mergeColumnOne.length; i++) {

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

@@ -11,6 +11,7 @@
           <el-table-column label="SKU品名" prop="skuSpecName" min-width="220" />
           <el-table-column label="数量（PCS）" align="center" prop="quantity" width="160" />
           <el-table-column label="SKU单价" align="center" prop="unitPrice" width="160" />
+          <el-table-column label="质检费" align="center" prop="checkFee" width="140" />
           <el-table-column label="小计" align="center" width="180">
             <template #default="{ row }">
               {{ moneyFormat(row.subtotal) }}
@@ -74,7 +75,7 @@ watch(
 );
 const labelList = ref({
   2: "quantity",
-  5: "total",
+  6: "total",
 });
 const textList = ref({
   1: "胜德体育总经理:",
@@ -102,7 +103,7 @@ const getSummaries = ({ columns, data }) => {
       return;
     } else {
       sums[index] = h("div", { class: "" }, [
-        [1, 3, 4].includes(index)
+        [1, 3, 4, 5].includes(index)
           ? h("div", {
               style: {
                 "text-align": "center",
@@ -150,7 +151,7 @@ const getSummaries = ({ columns, data }) => {
           },
           innerHTML: ".",
         }),
-        [3, 4, 5].includes(index)
+        [3, 4, 5, 6].includes(index)
           ? h("div", {
               style: {
                 "text-align": "center",

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

@@ -17,7 +17,8 @@
           <el-table-column label="快递包材费汇总" align="center" prop="deliveryMaterialsFeeSummary" width="130" />
           <el-table-column label="包装人工费汇总" align="center" prop="packingLaborSummary" width="130" />
           <el-table-column label="管理费汇总" align="center" prop="managementFeeSummary" width="130" />
-          <el-table-column label="打样费" align="center" prop="proofingFeeSummary" width="100" />
+          <el-table-column label="打样费" align="center" prop="proofingFeeSummary" width="100" v-if="tabValues.tabsCard != 4" />
+          <el-table-column label="质检费" align="center" prop="checkFeeSummary" width="100" v-else />
           <el-table-column label="小计" align="center" width="120">
             <template #default="{ row }">
               {{ moneyFormat(row.subtotal) }}
@@ -87,7 +88,7 @@ const labelList = ref({
   7: "deliveryMaterialsFeeSummary",
   8: "packingLaborSummary",
   9: "managementFeeSummary",
-  10: "proofingFeeSummary",
+  10: props.tabValues.tabsCard != 4 ? "proofingFeeSummary" : "checkFeeSummary",
   11: "subtotal",
   12: "total",
 });
@@ -186,7 +187,12 @@ const getSummaries = ({ columns, data }) => {
   return sums;
 };
 const getTotal = (label) => {
-  let list = tableData.value.map((item) => item[label]);
+  let list = [];
+  if (props.tabValues.tabsCard === 4 && label === "proofingFeeSummary") {
+    list = tableData.value.map((item) => item["checkFeeSummary"]);
+  } else {
+    list = tableData.value.map((item) => item[label]);
+  }
   return Number(Math.round(list.reduce((acc, curr) => acc + curr, 0) * 100) / 100);
 };
 const emit = defineEmits(["clickCancel"]);

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

@@ -93,6 +93,7 @@ watch(
                           managementFeeSummary: res[i].skuSpecList[j].bomSpecList[y].managementFeeSummary,
                           proofingFeeSummary: res[i].skuSpecList[j].bomSpecList[y].proofingFeeSummary,
                           unitPriceSKU: res[i].skuSpecList[j].unitPrice,
+                          checkFee: res[i].skuSpecList[j].checkFee,
                           total: res[i].total,
                           indexOne: indexOne,
                           indexTwo: indexTwo,
@@ -264,21 +265,27 @@ const columns = computed(() => {
       width: 100,
     },
     {
-      dataKey: "subtotal",
+      dataKey: "checkFee",
       key: "column-18",
+      title: "质检费",
+      width: 100,
+    },
+    {
+      dataKey: "subtotal",
+      key: "column-19",
       title: "小计",
       width: 120,
     },
     {
       dataKey: "total",
-      key: "column-19",
+      key: "column-20",
       title: "合计",
       width: 120,
     },
   ];
 });
-const mergeColumnOne = [0, 1, 2, 19];
-const mergeColumnTwo = [3, 4, 5, 17, 18];
+const mergeColumnOne = [0, 1, 2, 20];
+const mergeColumnTwo = [3, 4, 5, 17, 18, 19];
 const Row = ({ rowData, cells }) => {
   if (rowData.indexOne > 1) {
     for (let i = 0; i < mergeColumnOne.length; i++) {

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

@@ -11,6 +11,7 @@
           <el-table-column label="SKU品名" prop="skuSpecName" min-width="220" />
           <el-table-column label="数量（PCS）" align="center" prop="quantity" width="160" />
           <el-table-column label="SKU单价" align="center" prop="unitPrice" width="160" />
+          <el-table-column label="质检费" align="center" prop="checkFee" width="140" />
           <el-table-column label="小计" align="center" width="180">
             <template #default="{ row }">
               {{ moneyFormat(row.subtotal) }}
@@ -74,7 +75,7 @@ watch(
 );
 const labelList = ref({
   2: "quantity",
-  5: "total",
+  6: "total",
 });
 const textList = ref({
   1: "胜德体育总经理:",
@@ -102,7 +103,7 @@ const getSummaries = ({ columns, data }) => {
       return;
     } else {
       sums[index] = h("div", { class: "" }, [
-        [1, 3, 4].includes(index)
+        [1, 3, 4, 5].includes(index)
           ? h("div", {
               style: {
                 "text-align": "center",
@@ -150,7 +151,7 @@ const getSummaries = ({ columns, data }) => {
           },
           innerHTML: ".",
         }),
-        [3, 4, 5].includes(index)
+        [3, 4, 5, 6].includes(index)
           ? h("div", {
               style: {
                 "text-align": "center",