From c4aabf6addf7f9d28cd5cca8ce9395bc37f9c9d3 Mon Sep 17 00:00:00 2001
From: ln1778 <465410291@qq.com>
Date: Tue, 7 May 2024 14:54:32 +0800
Subject: [PATCH] 33

---
 commontable/tablepagination.vue | 13 +++++++++++--
 package.json                    |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/commontable/tablepagination.vue b/commontable/tablepagination.vue
index 2968f75..ea1d73b 100644
--- a/commontable/tablepagination.vue
+++ b/commontable/tablepagination.vue
@@ -1,9 +1,10 @@
 <template>
   <div class="calculation">
-    <div>
+    <div v-if="costVisible">
       <span style="font-weight: bold; padding: 0 10px">本页信息:</span>
       <span style="padding: 0 10px">总定价:{{ total_cost }}元</span>
     </div>
+    <div v-else></div>
     <div class="block">
       <el-pagination
         @size-change="handleSizeChange"
@@ -24,6 +25,12 @@ import { add } from "./../utils/Decimal";
 export default {
   name:"erpTablePagination",
   props: {
+    costVisible:{
+      type: Boolean,
+      default: () => {
+        return false;
+      },
+    },
     currentPage4: {
       type: Number,
     },
@@ -48,7 +55,9 @@ export default {
     total_cost: function () {
       let priceNumber = 0;
       this.tableData.map((res, index) => {
-        priceNumber = add(priceNumber, res.total_cost);
+        if(res.total_cost){
+          priceNumber = add(priceNumber, res.total_cost);
+        } 
       });
       return priceNumber.toFixed(2);
     },
diff --git a/package.json b/package.json
index 44bad15..c970d67 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "erp-element-ui",
-  "version": "1.0.21", 
+  "version": "1.0.22", 
   "description": "",
   "main": "index.js",
   "scripts": {