From 469deea02b1f5e8625a1007561f0a69625ae41f3 Mon Sep 17 00:00:00 2001
From: lixin <lixin@meswork.com>
Date: Mon, 26 Nov 2018 11:20:38 +0800
Subject: [PATCH] lx bug

---
 src/views/Inventory/ExchangePart/index.vue   |  8 ++++----
 src/views/Inventory/InventoryCheck/index.vue | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue
index a7b7500a..9506ffba 100644
--- a/src/views/Inventory/ExchangePart/index.vue
+++ b/src/views/Inventory/ExchangePart/index.vue
@@ -109,12 +109,12 @@
               </el-table-column>
               <el-table-column label="机床名称" align="center" min-width="80">
                 <template slot-scope="scope">
-                  {{ scope.row.机床名称 }}
+                  {{ scope.row.机床图号 }}
                 </template>
               </el-table-column>
               <el-table-column label="组件名称" align="center" min-width="80">
                 <template slot-scope="scope">
-                  {{ scope.row.组件名称 }}
+                  {{ scope.row.组号 }}
                 </template>
               </el-table-column>
               <el-table-column label="物料名称" align="center" min-width="80">
@@ -149,12 +149,12 @@
               </el-table-column>
               <el-table-column label="机床名称" align="center" min-width="80">
                 <template slot-scope="scope">
-                  {{ scope.row.机床名称 }}
+                  {{ scope.row.机床图号 }}
                 </template>
               </el-table-column>
               <el-table-column label="组件名称" align="center" min-width="80">
                 <template slot-scope="scope">
-                  {{ scope.row.组件名称 }}
+                  {{ scope.row.组号 }}
                 </template>
               </el-table-column>
               <el-table-column label="物料名称" align="center" min-width="80">
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index 5a3bd0a6..4a528cc5 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -142,7 +142,7 @@
             </el-table-column>
             <el-table-column label="出库时间" align="center" min-width="80">
               <template slot-scope="scope">
-                {{ scope.row.出库时间 }}
+                {{ scope.row.出库日期 ? scope.row.出库日期.split(' ')[0] : '' }}
               </template>
             </el-table-column>
             <el-table-column label="领用者" align="center" min-width="80">
@@ -299,7 +299,7 @@
             </el-table-column>
             <el-table-column label="出库时间" align="center" min-width="80">
               <template slot-scope="scope">
-                {{ scope.row.出库时间 }}
+                {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
             <el-table-column label="领用者" align="center" min-width="80">
@@ -451,7 +451,7 @@
             </el-table-column>
             <el-table-column label="出库时间" align="center" min-width="80">
               <template slot-scope="scope">
-                {{ scope.row.出库时间 }}
+                {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
             <el-table-column label="领用者" align="center" min-width="80">
@@ -615,7 +615,7 @@
             </el-table-column>
             <el-table-column label="出库时间" align="center" min-width="80">
               <template slot-scope="scope">
-                {{ scope.row.出库时间 }}
+                {{ scope.row.出库时间 ? scope.row.到货时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
             <el-table-column label="领用者" align="center" min-width="80">
@@ -777,7 +777,7 @@
             </el-table-column>
             <el-table-column label="出库时间" align="center" min-width="80">
               <template slot-scope="scope">
-                {{ scope.row.出库时间 }}
+                {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
             <el-table-column label="领用者" align="center" min-width="80">
@@ -937,7 +937,7 @@
             </el-table-column>
             <el-table-column label="出库时间" align="center" min-width="80">
               <template slot-scope="scope">
-                {{ scope.row.出库时间 }}
+                {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
             <el-table-column label="领用者" align="center" min-width="80">