From 5fd4e2cb4c21ac13e7868a81b5d29fa93039c065 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 5 Jul 2019 12:16:18 +0800
Subject: [PATCH] fixed bug

---
 .../CreateInquirySheet/index.vue              | 29 ++++++++++++-------
 .../PurchasingCenter/ReceiveCheck/index.vue   |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index b09bb801..8e40c869 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -48,7 +48,7 @@
                 size="small"
                 icon="el-icon-search"
                 style="margin-left: 10px"
-                @click="pageCurrent11=1;pageSize11=150;total11=0;searchTable11()">查询</el-button>
+                @click="pageCurrent11=1;pageSize11=100;total11=0;searchTable11()">查询</el-button>
               <el-button
                 type="warning"
                 size="small"
@@ -74,9 +74,9 @@
                 </el-table-column>
                 <el-table-column label="物料状态" align="center" width="80">
                   <template slot-scope="scope">
-                    <el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
-                    <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
-                    <el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+                    <el-tag v-if="unInquiry(scope.row)" type="warning" size="small">未询价</el-tag>
+                    <el-tag v-if="inquiry(scope.row)" type="success" size="small">已询价</el-tag>
+                    <el-tag v-if="purchased(scope.row)" type="info" size="small">已采购</el-tag>
                   </template>
                 </el-table-column>
                 <el-table-column label="任务分配时间" align="center" min-width="100">
@@ -234,7 +234,7 @@
                 size="small"
                 icon="el-icon-search"
                 style="margin-left: 10px"
-                @click="pageCurrent12=1;pageSize12=150;total12=0;searchTable12()">查询</el-button>
+                @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
               <el-button
                 type="warning"
                 size="small"
@@ -260,9 +260,9 @@
                 <!--</el-table-column>-->
                 <el-table-column label="零件状态" align="center" width="100">
                   <template slot-scope="scope">
-                    <el-tag v-if="parseInt(scope.row.询价状态编号)===1" type="warning" size="small">未询价</el-tag>
-                    <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
-                    <el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+                    <el-tag v-if="unInquiry(scope.row)" type="warning" size="small">未询价</el-tag>
+                    <el-tag v-if="inquiry(scope.row)" type="success" size="small">已询价</el-tag>
+                    <el-tag v-if="purchased(scope.row)" type="info" size="small">已采购</el-tag>
                   </template>
                 </el-table-column>
                 <el-table-column label="任务分配时间" align="center" min-width="100">
@@ -893,11 +893,11 @@ export default {
       tableData11: [], // 外购件列表
       total11: 0,
       pageCurrent11: 1,
-      pageSize11: 150,
+      pageSize11: 100,
       tableData12: [], // 基本件列表
       total12: 0,
       pageCurrent12: 1,
-      pageSize12: 150,
+      pageSize12: 100,
       remarkFilters: [],
       supplierFilters: [],
       tableData2: [], // 询价单列表
@@ -984,6 +984,15 @@ export default {
     this.searchTable2() // 查表2
   },
   methods: {
+    unInquiry(row) {
+      return parseInt(row.询价状态编号) === 1
+    },
+    inquiry(row) {
+      return parseInt(row.询价状态编号) === 3 && parseInt(row.采购状态编号) !== 3
+    },
+    purchased(row) {
+      return parseInt(row.询价状态编号) !== 1 && parseInt(row.采购状态编号) === 3
+    },
     filterSource(value, row) {
       return Number(row['零件类型']) === Number(value)
     },
diff --git a/src/views/PurchasingCenter/ReceiveCheck/index.vue b/src/views/PurchasingCenter/ReceiveCheck/index.vue
index 1d01a94e..217d56c4 100644
--- a/src/views/PurchasingCenter/ReceiveCheck/index.vue
+++ b/src/views/PurchasingCenter/ReceiveCheck/index.vue
@@ -70,7 +70,7 @@
         </el-table-column>
         <el-table-column align="center" label="小计(元)" prop="小计">
           <template slot-scope="scope">
-            {{ scope.row.小计.toFixed(2) }}
+            {{ scope.row.小计 ? scope.row.小计.toFixed(2) : 0 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="单价">