From 1044a96c37355fbdbbcec6a43b1bd21cf17008b0 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 12 Apr 2019 14:17:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E9=87=87=E8=B4=AD=E5=88=B0?=
 =?UTF-8?q?=E8=B4=A7=E6=95=B0=E9=87=8F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseSituationSearch/index.vue                | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 179ec660..676f09fe 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -64,24 +64,24 @@
               {{ scope.row.零件数量 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="采购数量" width="100px">
+          <el-table-column align="center" label="合同采购数量" width="100px">
             <template slot-scope="scope">
-              {{ scope.row.数量 || '—' }}
+              {{ scope.row.数量 || scope.row.离线采购数量 || '—' }}
             </template>
           </el-table-column>
           <el-table-column align="center" label="到货数量" width="100px">
             <template slot-scope="scope">
-              {{ scope.row.已到货数量 || '—' }}
+              {{ scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
             </template>
           </el-table-column>
           <el-table-column align="center" label="供应商" min-width="100px">
             <template slot-scope="scope">
-              {{ scope.row.供应商名称 || '—' }}
+              {{ scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="采购合同编号" min-width="100px">
+          <el-table-column align="center" label="合同编号" min-width="100px">
             <template slot-scope="scope">
-              {{ scope.row.采购合同编号 || '—' }}
+              {{ scope.row.采购合同编号 || scope.row.离线合同编号 || '—' }}
             </template>
           </el-table-column>
         </el-table>