From 65d2e1d80321b3b827fe41bec3efaf96be5d9c96 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Mon, 18 May 2020 21:36:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DiscardedPartsInquiry/index.vue                 | 10 +++++-----
 .../ManufacturingCenter/GroupMatching/index.vue     | 13 +++++++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
index dc0bfce8..817384ad 100644
--- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
@@ -117,8 +117,8 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
-    <el-dialog :visible.sync="dialogVisible" title="离线合同请款" center style="min-height: 300px" width="1000px">
-      <el-table :data="tableData2" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(226,223,223,1)" height="630" border style="width: 430px">
+    <el-dialog :visible.sync="dialogVisible" title="加工过程" center style="min-height: 250px" width="700px">
+      <el-table :data="tableData2" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(226,223,223,1)" border style="width: 690px">
         <el-table-column
           width="50px"
           prop="province1"
@@ -139,13 +139,13 @@
           prop="province4"
           label="工艺要求"
           align="center"
-          width="80px"
+          width="280px"
           show-overflow-tooltip
         >
           <template slot-scope="scope">{{ scope.row.工艺要求 }}</template>
         </el-table-column>
         <el-table-column
-          width="60px"
+          width="80px"
           prop="province5"
           label="单件定额"
           align="center"
@@ -153,7 +153,7 @@
           <template slot-scope="scope">{{ scope.row.单件定额工时 }}</template>
         </el-table-column>
         <el-table-column
-          width="60px"
+          width="80px"
           prop="province6"
           label="准结定额"
           align="center"
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index cb2211cc..0bdf62c6 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -123,7 +123,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="采购数量">
                   <template slot-scope="scope">
-                    {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
+                    {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : (scope.row.数量 !== '0.00' ? scope.row.数量 : '—' ) || '—' }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="用库存数">
@@ -133,7 +133,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="采购时间">
                   <template slot-scope="scope">
-                    {{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : scope.row.采购日期.split(' ')[0] }}
+                    {{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : scope.row.采购时间.split(' ')[0] }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="到货数量">
@@ -188,7 +188,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="采购数量">
                   <template slot-scope="scope">
-                    {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.离线采购数量 || (scope.row.数量==='0' ? '—' : scope.row.数量) || '—' }}
+                    {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : (scope.row.数量 !== '0.00' ? scope.row.数量 : '—' ) || '—' }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="用滞货数">
@@ -203,7 +203,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="采购时间">
                   <template slot-scope="scope">
-                    {{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : scope.row.采购日期.split(' ')[0] }}
+                    {{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : scope.row.采购时间.split(' ')[0] }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="到货数量">
@@ -294,6 +294,11 @@
         <el-tab-pane label="制造部采购" name="制造部采购">
           <!--<h3 style="text-align: center;">制造部采购</h3>-->
           <el-table :data="tableData1" border style="width: 100%;margin-top: 6px;" height="600">
+            <el-table-column label="进程" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.采购状态 }}
+              </template>
+            </el-table-column>
             <el-table-column label="机床图号" align="center" min-width="80">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}