From 184c7b151a8ab002c9d1cf22a0d137ee7822ba5b Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 9 Mar 2019 10:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BE=E5=88=86=E6=95=B0=E8=B6=85100?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PurchasingCenter/ArrivalStateSearch/index.vue | 2 +-
 src/views/PurchasingCenter/PayStateSearch/index.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
index 91030159..b433f16c 100644
--- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
+++ b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
@@ -62,7 +62,7 @@
             <el-progress
               :text-inside="true"
               :stroke-width="18"
-              :percentage="parseFloat((100*scope.row.合同到货总数/scope.row.合同采购总数).toFixed(2))"
+              :percentage="scope.row.到货进度 = (100*(Number(scope.row.合同到货总数))/scope.row.合同采购总数) > 100 ? 100 : Number((100*(Number(scope.row.合同到货总数))/scope.row.合同采购总数).toFixed(2))"
               status="success"/>
           </template>
         </el-table-column>
diff --git a/src/views/PurchasingCenter/PayStateSearch/index.vue b/src/views/PurchasingCenter/PayStateSearch/index.vue
index 46517b43..81580061 100644
--- a/src/views/PurchasingCenter/PayStateSearch/index.vue
+++ b/src/views/PurchasingCenter/PayStateSearch/index.vue
@@ -95,7 +95,7 @@
             <el-progress
               :text-inside="true"
               :stroke-width="18"
-              :percentage="(100*(Number(scope.row.已付金额))/scope.row.合同总额).toFixed(2)"
+              :percentage="scope.row.付款进度 = (100*(Number(scope.row.已付金额))/scope.row.合同总额) > 100 ? 100 : Number((100*(Number(scope.row.已付金额))/scope.row.合同总额).toFixed(2))"
               status="success"/>
           </template>
         </el-table-column>