对账单,对账单报表,销售出货表增加打样费

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

@@ -17,6 +17,7 @@
           <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" width="120">
             <template #default="{ row }">
               {{ moneyFormat(row.subtotal) }}
@@ -86,8 +87,9 @@ const labelList = ref({
   7: "deliveryMaterialsFeeSummary",
   8: "packingLaborSummary",
   9: "managementFeeSummary",
-  10: "subtotal",
-  11: "total",
+  10: "proofingFeeSummary",
+  11: "subtotal",
+  12: "total",
 });
 const textList = ref({
   1: "胜德体育总经理:",

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

@@ -91,6 +91,7 @@ watch(
                           deliveryMaterialsFeeSummary: res[i].skuSpecList[j].bomSpecList[y].deliveryMaterialsFeeSummary,
                           packingLaborSummary: res[i].skuSpecList[j].bomSpecList[y].packingLaborSummary,
                           managementFeeSummary: res[i].skuSpecList[j].bomSpecList[y].managementFeeSummary,
+                          proofingFeeSummary: res[i].skuSpecList[j].bomSpecList[y].proofingFeeSummary,
                           unitPriceSKU: res[i].skuSpecList[j].unitPrice,
                           total: res[i].total,
                           indexOne: indexOne,
@@ -244,27 +245,33 @@ const columns = computed(() => {
       width: 100,
     },
     {
-      dataKey: "unitPriceSKU",
+      dataKey: "proofingFeeSummary",
       key: "column-16",
+      title: "打样费",
+      width: 100,
+    },
+    {
+      dataKey: "unitPriceSKU",
+      key: "column-17",
       title: "SKU单价",
       width: 100,
     },
     {
       dataKey: "subtotal",
-      key: "column-17",
+      key: "column-18",
       title: "小计",
       width: 120,
     },
     {
       dataKey: "total",
-      key: "column-18",
+      key: "column-19",
       title: "合计",
       width: 120,
     },
   ];
 });
-const mergeColumnOne = [0, 1, 2, 18];
-const mergeColumnTwo = [3, 4, 5, 16, 17];
+const mergeColumnOne = [0, 1, 2, 19];
+const mergeColumnTwo = [3, 4, 5, 17, 18];
 const Row = ({ rowData, cells }) => {
   if (rowData.indexOne > 1) {
     for (let i = 0; i < mergeColumnOne.length; i++) {

src/views/group/finance/sales-shipment/index.vue

@@ -52,6 +52,7 @@
       <el-table-column label="快递包材费" prop="deliveryMaterialsFeeSummary" align="center" width="100" />
       <el-table-column label="包装人工费" prop="packingLaborSummary" align="center" width="100" />
       <el-table-column label="管理费" prop="managementFeeSummary" align="center" width="90" />
+      <el-table-column label="打样费" prop="proofingFeeSummary" align="center" width="90" />
       <el-table-column label="SKU单价" prop="unitPriceSKU" align="center" width="90" />
       <el-table-column label="小计" align="center" width="120">
         <template #default="{ row }">
@@ -262,6 +263,7 @@ const getList = async (req, status) => {
                   deliveryMaterialsFeeSummary: res.rows[i].skuSpecList[j].bomSpecList[y].deliveryMaterialsFeeSummary,
                   packingLaborSummary: res.rows[i].skuSpecList[j].bomSpecList[y].packingLaborSummary,
                   managementFeeSummary: res.rows[i].skuSpecList[j].bomSpecList[y].managementFeeSummary,
+                  proofingFeeSummary: res.rows[i].skuSpecList[j].bomSpecList[y].proofingFeeSummary,
                   unitPriceSKU: res.rows[i].skuSpecList[j].unitPrice,
                   subtotal: res.rows[i].skuSpecList[j].subtotal,
                   outerBoxPackingFee: res.rows[i].outerBoxPackingFee,
@@ -331,7 +333,7 @@ const clickExcelFile = () => {
   openFileList.value = true;
 };
 const objectSpanMethod = ({ rowIndex, columnIndex }) => {
-  if ([0, 1, 2, 3, 4, 5, 6, 7, 8, 22, 23, 24, 25, 26].includes(columnIndex)) {
+  if ([0, 1, 2, 3, 4, 5, 6, 7, 8, 23, 24, 25, 26, 27].includes(columnIndex)) {
     let spanName = [
       "statementOfAccountTime",
       "departmentName",

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

@@ -17,6 +17,7 @@
           <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" width="120">
             <template #default="{ row }">
               {{ moneyFormat(row.subtotal) }}
@@ -86,8 +87,9 @@ const labelList = ref({
   7: "deliveryMaterialsFeeSummary",
   8: "packingLaborSummary",
   9: "managementFeeSummary",
-  10: "subtotal",
-  11: "total",
+  10: "proofingFeeSummary",
+  11: "subtotal",
+  12: "total",
 });
 const textList = ref({
   1: "胜德体育总经理:",

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

@@ -91,6 +91,7 @@ watch(
                           deliveryMaterialsFeeSummary: res[i].skuSpecList[j].bomSpecList[y].deliveryMaterialsFeeSummary,
                           packingLaborSummary: res[i].skuSpecList[j].bomSpecList[y].packingLaborSummary,
                           managementFeeSummary: res[i].skuSpecList[j].bomSpecList[y].managementFeeSummary,
+                          proofingFeeSummary: res[i].skuSpecList[j].bomSpecList[y].proofingFeeSummary,
                           unitPriceSKU: res[i].skuSpecList[j].unitPrice,
                           total: res[i].total,
                           indexOne: indexOne,
@@ -251,27 +252,33 @@ const columns = computed(() => {
       width: 100,
     },
     {
-      dataKey: "unitPriceSKU",
+      dataKey: "proofingFeeSummary",
       key: "column-16",
+      title: "打样费",
+      width: 100,
+    },
+    {
+      dataKey: "unitPriceSKU",
+      key: "column-17",
       title: "SKU单价",
       width: 100,
     },
     {
       dataKey: "subtotal",
-      key: "column-17",
+      key: "column-18",
       title: "小计",
       width: 120,
     },
     {
       dataKey: "total",
-      key: "column-18",
+      key: "column-19",
       title: "合计",
       width: 120,
     },
   ];
 });
-const mergeColumnOne = [0, 1, 2, 18];
-const mergeColumnTwo = [3, 4, 5, 16, 17];
+const mergeColumnOne = [0, 1, 2, 19];
+const mergeColumnTwo = [3, 4, 5, 17, 18];
 const Row = ({ rowData, cells }) => {
   if (rowData.indexOne > 1) {
     for (let i = 0; i < mergeColumnOne.length; i++) {