Browse Source

隐藏外箱包装费

lxf 1 year ago
parent
commit
c356aad05b

+ 0 - 2
src/views/group/finance/check-bill/index.vue

@@ -69,7 +69,6 @@
               <el-table-column label="包装人工费 ¥" prop="packingLabor" align="right" width="110" />
               <el-table-column label="包材费 ¥" prop="packagingMaterialCost" align="right" width="100" />
               <el-table-column label="管理费 ¥" prop="managementFee" align="right" width="100" />
-              <el-table-column label="外箱包装费 ¥" prop="outerBoxPackingFee" align="right" width="110" />
               <el-table-column label="操作" align="center" fixed="right" width="60">
                 <template #default="{ $index }">
                   <el-button type="danger" @click="clickOrderDelete($index)" text>删除</el-button>
@@ -422,7 +421,6 @@ const selectOrder = (row) => {
     deliveryMaterialsFee: row.deliveryMaterialsFee,
     packingLabor: row.packingLabor,
     managementFee: row.managementFee,
-    outerBoxPackingFee: row.outerBoxPackingFee,
     packagingMaterialCost: row.packagingMaterialCost,
   });
   ElMessage({ message: "添加成功", type: "success" });

+ 2 - 9
src/views/group/finance/check-bill/printOrder.vue

@@ -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) {

+ 2 - 9
src/views/group/finance/summary/printOrder.vue

@@ -89,7 +89,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,
@@ -259,20 +258,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) {