From c5a05f8f5dab52b94c8a225aa7d626be39d530d9 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Sun, 22 Sep 2019 11:26:11 +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

---
 src/styles/index.scss                                  |  4 ++++
 src/views/Assembly/AssemblyExecution/index.vue         | 10 +++++-----
 src/views/Assembly/MakeAssemblyPlan/index.vue          |  2 +-
 src/views/Assembly/MakeColdWorkPlan/index.vue          |  2 +-
 src/views/Assembly/MakeElectricalAssembly/index.vue    |  2 +-
 src/views/Assembly/MakePaintPlan/index.vue             |  2 +-
 .../Outsourcing/OutsourcingTaskExecution/index.vue     |  4 ++--
 src/views/PurchasingCenter/ArrivalEnquiry/index.vue    |  5 -----
 8 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 7a4f2451..0d996017 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -218,3 +218,7 @@ el-card{
   //card白条宽度
   padding: 5px 5px;
 }
+h3 {
+  height: 10px!important;
+  margin: 0px!important;
+}
diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index ecf9f1ff..99a7f1b1 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -25,7 +25,7 @@
       </el-row>
     </el-card>
     <el-card>
-      <h3 style="text-align: center;">总装调试</h3>
+      <h3 style="text-align: center">总装调试</h3>
       <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
@@ -37,12 +37,12 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center">
+        <el-table-column label="机床名称" align="center" width="120px">
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床数量" align="center">
+        <el-table-column label="机床数量" align="center" width="50px">
           <template slot-scope="scope">
             {{ scope.row.机床数量 }}
           </template>
@@ -67,7 +67,7 @@
             {{ scope.row.调试结束时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="460px" fixed="right">
+        <el-table-column label="操作" align="center" width="430px" fixed="right">
           <template slot-scope="scope">
             <el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" size="small" @click="handlestart_1(scope.row)">开始装配</el-button>
             <el-button v-if="scope.row.装配状态===1" type="danger" size="small" @click="handleend_1(scope.row)">结束装配</el-button>
@@ -84,7 +84,7 @@
       </el-table>
     </el-card>
     <el-card>
-      <h3 style="text-align: center;">部装</h3>
+      <h3 style="text-align: center">部装</h3>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue
index 78643f0a..ad0cd019 100644
--- a/src/views/Assembly/MakeAssemblyPlan/index.vue
+++ b/src/views/Assembly/MakeAssemblyPlan/index.vue
@@ -57,7 +57,7 @@
       </el-table>
     </el-card>
     <el-card>
-      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加</el-button>
+      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加装配计划</el-button>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
diff --git a/src/views/Assembly/MakeColdWorkPlan/index.vue b/src/views/Assembly/MakeColdWorkPlan/index.vue
index 7123edef..785a18cb 100644
--- a/src/views/Assembly/MakeColdWorkPlan/index.vue
+++ b/src/views/Assembly/MakeColdWorkPlan/index.vue
@@ -57,7 +57,7 @@
       </el-table>
     </el-card>
     <el-card>
-      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加</el-button>
+      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加冷作计划</el-button>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
diff --git a/src/views/Assembly/MakeElectricalAssembly/index.vue b/src/views/Assembly/MakeElectricalAssembly/index.vue
index 74f7c566..fbe5f185 100644
--- a/src/views/Assembly/MakeElectricalAssembly/index.vue
+++ b/src/views/Assembly/MakeElectricalAssembly/index.vue
@@ -57,7 +57,7 @@
       </el-table>
     </el-card>
     <el-card>
-      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加</el-button>
+      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加电气计划</el-button>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
diff --git a/src/views/Assembly/MakePaintPlan/index.vue b/src/views/Assembly/MakePaintPlan/index.vue
index 92bc2249..63e291d4 100644
--- a/src/views/Assembly/MakePaintPlan/index.vue
+++ b/src/views/Assembly/MakePaintPlan/index.vue
@@ -57,7 +57,7 @@
       </el-table>
     </el-card>
     <el-card>
-      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加</el-button>
+      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加油漆计划</el-button>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 93b94f6f..764a6aac 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -158,7 +158,7 @@
       <el-button type="info" size="mini" icon="el-icon-arrow-down" style="margin-left:10px;margin-top: 15px" @click="getSpareParts">选入零件</el-button>
     </el-card>
     <el-card>
-      <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" stripe  size="mini" :row-class-name="tableRowClassName" show-summary>
+      <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" :row-class-name="tableRowClassName" stripe size="mini" show-summary>
         <el-table-column :index="indexMethod" label="序号" align="center" type="index" width="50px"/>
         <el-table-column label="零件图号" align="center" width="200px">
           <template slot-scope="scope">
@@ -416,7 +416,7 @@
         <el-input v-model="input" size="small" clearable style="width:200px"/>
         <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="searchData()">查询</el-button>
       </div>
-      <el-table :data="List2" max-height="370" stripe  size="mini" highlight-current-row @row-click="handleCurrentChange3">
+      <el-table :data="List2" max-height="370" stripe size="mini" highlight-current-row @row-click="handleCurrentChange3">
         <el-table-column label="外协厂家" align="center" >
           <template slot-scope="scope">
             {{ scope.row.外协厂家名称 }}
diff --git a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
index f651786e..5d11108e 100644
--- a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
+++ b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
@@ -36,11 +36,6 @@
             {{ scope.row.采购合同流水号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购编码" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.采购合同流水号 }}
-          </template>
-        </el-table-column>
         <el-table-column label="采购合同编号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}