From 257da271067db5dd8ed3bc1d5e4e76733858374a Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 19 Nov 2018 14:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C=EF=BC=9A?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=B0=8F=E8=AE=A1NaN=EF=BC=9B=E7=A6=BB?=
 =?UTF-8?q?=E7=BA=BF=E5=90=88=E5=90=8C=E8=AF=B7=E6=AC=BE=EF=BC=9A=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E8=AF=B7=E6=AC=BE=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PurchasingCenter/OfflineContract/index.vue          | 4 ++--
 .../PurchasingCenter/OfflineContractRequestFund/index.vue     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 40eac828..676eb163 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -244,7 +244,7 @@
         </el-table-column>
         <el-table-column label="合计" align="center" min-width="100" prop="合计">
           <template slot-scope="scope">
-            {{ parseFloat(scope.row.单价) * parseInt(scope.row.数量) }}
+            {{ parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0) }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100">
@@ -620,7 +620,7 @@ export default {
       disable2: true,
       disable3: true,
       disable4: true,
-      disable: false // 其他的禁用
+      disable: true // 其他的禁用
     }
   },
   computed: {
diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
index f3c7c393..d61faca9 100644
--- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
@@ -95,7 +95,7 @@
               </el-table>
               <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-left: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
             </el-popover>
-            <el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
+            <el-button :disabled="parseInt(scope.row.审核情况流水号)!==3&&parseInt(scope.row.审批情况流水号)!==3&&parseInt(scope.row.付款情况流水号)!==3" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
           </template>
         </el-table-column>
       </el-table>