From db64fc3d6ff2809ec6b5d8cc42a21c67746df209 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 25 八月 2023 19:23:46 +0800
Subject: [PATCH] 采购订单的 添加  2023-8-25

---
 src/components/makepager/CommonFormTableView.vue |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 55fee16..035740b 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -63,7 +63,7 @@
                     <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
                   </div>
                   <div class="common-select-btn" @click="clearupClient(scope.row)">
-                    <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+                    <i class="el-icon-remove-outline" title="娓呴櫎"></i>
                   </div>
                 </div>
               </el-form-item>
@@ -129,7 +129,7 @@
       <el-button size="small" type="primary" @click="add">鏂板</el-button>
       <!-- <el-button size="small" type="primary" disabled>瀵煎叆鏄庣粏</el-button> -->
       <el-button size="small" type="primary" @click="empty">娓呯┖</el-button>
-      <el-button size="small" type="primary" @click="recalculate" :disabled="isRecalculate ? false : true"
+      <el-button size="small" v-if="recalculateShow" type="primary" @click="recalculate" :disabled="isRecalculate ? false : true"
         >閲嶇畻</el-button
       >
     </div>
@@ -185,10 +185,16 @@
           total: false,
           refundable: false,
           sumProp: [],
+          titleProp:["#", "浜у搧鍚嶇О"],
           mergeNumber: 1
         }
       }
-    }
+    },
+    recalculateShow:{
+      type:[Boolean],
+      defalut:true,
+    },
+    
   },
   data() {
     return {
@@ -263,7 +269,7 @@
           sums[index] = "灏忚:"
           return
         }
-        const title = ["#", "浜у搧鍚嶇О"]
+        const title = this.showSummary.titleProp
         // 鍘婚櫎鏌愪簺涓嶉渶瑕佽绠楃殑鏁版嵁
         if (title.includes(column.label)) {
           sums[index] = ""

--
Gitblit v1.8.0