From 5ddf0723af950e3f0fb0dd93b3933dfd2f8ab201 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Tue, 11 Feb 2020 10:09:26 +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

---
 .../PartAssignment/index.vue                    |  4 ++--
 .../ProcurementContractEnquiry/index.vue        |  1 -
 .../ProjectTotalSearch/index.vue                | 17 +++++------------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 953f9c7c..34c9667e 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -287,10 +287,10 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col style="width: 900px;margin-left: 10px">
+      <el-col style="width: 920px;margin-left: 10px">
         <el-card>
           <el-table :data="tableData6" border size="mini" style="width: 100%" height="300px">
-            <el-table-column label="序号" type="index" align="center" width="45px"/>
+            <el-table-column label="序号" type="index" align="center" width="50px"/>
             <el-table-column label="零件名称" show-overflow-tooltip align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index 44f214f2..bed309cb 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -56,7 +56,6 @@
         :row-class-name="tableRowClassName"
         size="mini"
         border
-        stripe
         style="width: 100%"
         height="500px"
         highlight-current-row
diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
index da4661a5..480991a3 100644
--- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
+++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
@@ -28,17 +28,17 @@
       <el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
         <el-table-column label="零件名称" align="center" width="150">
           <template slot-scope="scope">
-            {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.组件名称 }}
+            {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
         <el-table-column label="图号或型号" align="center" width="150">
           <template slot-scope="scope">
-            {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.组号 }}
+            {{ scope.row.图号或型号 }}
           </template>
         </el-table-column>
         <el-table-column label="材料或规格" align="center" width="100">
           <template slot-scope="scope">
-            {{ scope.row.材料 ? scope.row.材料 : scope.row.物料规格 }}
+            {{ scope.row.材料或规格 }}
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center" width="100">
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import { initProject, searchProjectTotal1, searchProjectTotal2 } from '@/api/WorkshopProcurement/ProjectTotalSearch'
+import { initProject, searchProjectTotal2 } from '@/api/WorkshopProcurement/ProjectTotalSearch'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -99,16 +99,8 @@ export default {
     },
     searchTable1() {
       if (this.projectValue) {
-        searchProjectTotal1(this.projectValue).then(response => {
-          this.tableData = response.data
-        })
         searchProjectTotal2(this.projectValue).then(response => {
           this.tableData2 = response.data
-          for (let i = 0; i < response.data.length; i++) {
-            if (response.data[i].物料型号 === null || response.data[i].物料型号 === '') {
-              response.data[i].物料型号 = response.data[i].零件图号
-            }
-          }
         })
       } else {
         this.$message.error('请选择项目')
@@ -164,3 +156,4 @@ export default {
     width:300px
   }
 </style>
+