1

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

@@ -3,6 +3,8 @@
     <el-card style="height: calc(100vh - 168px); overflow-y: auto; overflow-x: hidden" v-loading="loading">
       <div id="tableId">
         <el-table :data="tableData" border :row-style="{ height: '35px' }" header-row-class-name="tableHeader" show-summary :summary-method="getSummaries">
+          <el-table-column label="维度" prop="dimensionality" width="120" />
+          <el-table-column label="客户" prop="departmentName" width="160" />
           <el-table-column label="E10品号" prop="bomSpecCode" width="140" />
           <el-table-column label="SKU品名" prop="bomSpecName" min-width="220" />
           <el-table-column label="数量（PCS）" align="center" prop="quantity" width="130" />
@@ -55,18 +57,18 @@ onMounted(() => {
   }
 });
 const labelList = ref({
-  2: "quantity",
-  4: "laserLogoSummary",
-  5: "laserMitochondrialSummary",
-  6: "lssueFeeSummary",
-  7: "deliveryMaterialsFeeSummary",
-  8: "packingLaborSummary",
-  9: "subtotal",
-  10: "total",
+  4: "quantity",
+  6: "laserLogoSummary",
+  7: "laserMitochondrialSummary",
+  8: "lssueFeeSummary",
+  9: "deliveryMaterialsFeeSummary",
+  10: "packingLaborSummary",
+  11: "subtotal",
+  12: "total",
 });
 const textList = ref({
-  1: "胜德体育总经理:",
-  2: "申请日期:",
+  3: "胜德体育总经理:",
+  6: "申请日期:",
 });
 const getSummaries = ({ columns, data }) => {
   const sums = [];
@@ -90,7 +92,7 @@ const getSummaries = ({ columns, data }) => {
       return;
     } else {
       sums[index] = h("div", { class: "" }, [
-        [1, 3].includes(index)
+        [1, 2, 3, 5].includes(index)
           ? h("div", {
               style: {
                 "text-align": "center",
@@ -138,7 +140,7 @@ const getSummaries = ({ columns, data }) => {
           },
           innerHTML: ".",
         }),
-        [1, 2].includes(index)
+        [3, 6].includes(index)
           ? h("div", { style: { "font-size": "16px", "font-weight": 700, padding: "0 12px", "text-align": "left" }, innerHTML: textList.value[index] })
           : h("div", {
               style: {

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

@@ -11,14 +11,16 @@
           :summary-method="getSummaries"
           :span-method="objectSpanMethod"
           max-height="calc(100vh - 79px)">
+          <el-table-column label="维度" prop="dimensionality" width="120" />
+          <el-table-column label="客户" prop="departmentName" width="160" />
           <el-table-column label="订单时间" prop="wlnCreateTime" align="center" width="160" />
           <el-table-column label="订单号" prop="code" width="180" />
           <el-table-column label="万里牛单号" prop="wlnCode" width="140" />
           <el-table-column label="SKU单号" prop="skuSpecCode" width="140" />
-          <el-table-column label="SKU品号" prop="skuSpecName" width="180" />
+          <el-table-column label="SKU品号" prop="skuSpecName" width="240" />
           <el-table-column label="SKU数量" prop="quantitySKU" width="100" />
           <el-table-column label="BOM品号" prop="bomSpecCode" width="140" />
-          <el-table-column label="BOM品名" prop="bomSpecName" width="240" />
+          <el-table-column label="BOM品名" prop="bomSpecName" width="300" />
           <el-table-column label="BOM数量" prop="quantityBOM" width="100" />
           <el-table-column label="单价" prop="unitPriceBOM" width="100" />
           <el-table-column label="激光LOGO" prop="laserLogoSummary" width="100" />
@@ -72,6 +74,8 @@ onMounted(() => {
                   for (let x = 0; x < res[i].skuSpecList[j].bomSpecList.length; x++) {
                     list.push({
                       orderId: res[i].orderId,
+                      dimensionality: res[i].dimensionality,
+                      departmentName: res[i].departmentName,
                       wlnCreateTime: res[i].wlnCreateTime,
                       code: res[i].code,
                       wlnCode: res[i].wlnCode,
@@ -137,8 +141,8 @@ const mergeRow = (list) => {
   return list;
 };
 const textList = ref({
-  4: "胜德体育总经理:",
-  7: "申请日期:",
+  3: "胜德体育总经理:",
+  6: "申请日期:",
 });
 const getSummaries = ({ columns, data }) => {
   const sums = [];
@@ -162,7 +166,7 @@ const getSummaries = ({ columns, data }) => {
       return;
     } else {
       sums[index] = h("div", { class: "" }, [
-        index !== 17
+        index !== 19
           ? h("div", {
               style: {
                 "text-align": "center",
@@ -210,7 +214,7 @@ const getSummaries = ({ columns, data }) => {
           },
           innerHTML: ".",
         }),
-        [4, 7].includes(index)
+        [3, 6].includes(index)
           ? h("div", { style: { "font-size": "16px", "font-weight": 700, padding: "0 12px", "text-align": "left" }, innerHTML: textList.value[index] })
           : h("div", {
               style: {

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

@@ -3,6 +3,8 @@
     <el-card style="height: calc(100vh - 168px); overflow-y: auto; overflow-x: hidden" v-loading="loading">
       <div id="tableId">
         <el-table :data="tableData" border :row-style="{ height: '35px' }" header-row-class-name="tableHeader" show-summary :summary-method="getSummaries">
+          <el-table-column label="维度" prop="dimensionality" width="140" />
+          <el-table-column label="客户" prop="departmentName" width="180" />
           <el-table-column label="SKU品号" prop="skuSpecCode" width="180" />
           <el-table-column label="SKU品名" prop="skuSpecName" min-width="220" />
           <el-table-column label="数量（PCS）" align="center" prop="quantity" width="160" />
@@ -50,12 +52,12 @@ onMounted(() => {
   }
 });
 const labelList = ref({
-  2: "quantity",
-  5: "total",
+  4: "quantity",
+  7: "total",
 });
 const textList = ref({
-  1: "胜德体育总经理:",
-  2: "申请日期:",
+  3: "胜德体育总经理:",
+  4: "申请日期:",
 });
 const getSummaries = ({ columns, data }) => {
   const sums = [];
@@ -79,7 +81,7 @@ const getSummaries = ({ columns, data }) => {
       return;
     } else {
       sums[index] = h("div", { class: "" }, [
-        [1, 3, 4].includes(index)
+        [1, 2, 3, 5, 6].includes(index)
           ? h("div", {
               style: {
                 "text-align": "center",
@@ -127,7 +129,7 @@ const getSummaries = ({ columns, data }) => {
           },
           innerHTML: ".",
         }),
-        [3, 4, 5].includes(index)
+        [1, 2, 5, 6, 7].includes(index)
           ? h("div", {
               style: {
                 "text-align": "center",