From e3035b1d55444222c4f068bc3cd159ea6cd21458 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Wed, 25 Sep 2019 20:11:52 +0800
Subject: [PATCH] aaa

---
 src/views/BasicData/WorkshopProcessMaintenance/index.vue  | 3 ++-
 src/views/ManufacturingCenter/GroupMatching/index.vue     | 6 +++---
 src/views/ManufacturingCenter/InitialProduction/index.vue | 2 +-
 .../ProductionCapacityBalance/index.vue                   | 2 +-
 .../ManufacturingCenter/TraceabilityOfParts/index.vue     | 8 ++++++--
 .../ImportChangeParts/specificationData1.vue              | 4 ++--
 src/views/TechnologyCenter/ImportParts/index.vue          | 3 +--
 .../TechnologyCenter/ImportParts/specificationData.vue    | 4 ++--
 8 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
index 68500813..f8f99a4c 100644
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -15,7 +15,8 @@
       </el-col>
       <el-col :span="17">
         <el-card>
-          <el-button type="primary" plain style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
+          <div style="height: 37px"/>
+          <el-button type="primary" plain style="margin-left: 10px" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
         </el-card>
       </el-col>
     </el-row>
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index a91cb3b0..04d7d21f 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -28,7 +28,7 @@
         v-loading="loading"
         :data="tableData"
         :summary-method="getSummaries"
-        style="width: 100%"
+        style="width: 100%;margin-top: 6px"
         highlight-current-row
         height="400"
         size="mini"
@@ -89,7 +89,7 @@
     </el-card>
     <el-card>
       <h3 style="text-align: center;">采购部采购</h3>
-      <el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
+      <el-tabs v-model="PartType" type="border-card" style="margin-top: 10px" @tab-click="searchTable()">
         <el-tab-pane label="标准件" name="标准件">
           <el-table :data="tableData00" size="mini" height="400px" border stripe>
             <el-table-column align="center" label="机床图号">
@@ -268,7 +268,7 @@
       <el-table
         :data="tableData1"
         border
-        style="width: 100%;"
+        style="width: 100%;margin-top: 6px;"
         height="400">
         <el-table-column label="机床图号" align="center" min-width="80">
           <template slot-scope="scope">
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index f608a3a0..69cd60fc 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -1064,7 +1064,7 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-date-editor{
     width:150px
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index c26ec400..7cee2dd8 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -602,7 +602,7 @@
           </el-table-column>
           <el-table-column label="更新" size="mini" align="center" width="90">
             <template slot-scope="scope">
-              <el-button size="mini" type="primary" style="" @click="updateDate(scope.$index)">更新</el-button>
+              <el-button size="mini" type="primary" plain style="" @click="updateDate(scope.$index)">更新</el-button>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue
index 2bf45415..ccebbec7 100644
--- a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue
+++ b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue
@@ -172,9 +172,13 @@
           </el-row>
           <el-divider content-position="right">跳转链接</el-divider>
           <el-row style="margin-left: 20px">
-            <el-button size="medium" type="text" @click="toStatusQuery">零件状态查询</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="转到零件状态查询模块" placement="top">
+              <el-button size="medium" type="text" @click="toStatusQuery">零件状态查询</el-button>
+            </el-tooltip>
             <el-divider direction="vertical"/>
-            <el-button size="medium" type="text" @click="toProcessingStatus">加工进度查询</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="转到加工进度查询模块" placement="top">
+              <el-button size="medium" type="text" @click="toProcessingStatus">加工进度查询</el-button>
+            </el-tooltip>
           </el-row>
         </div>
       </div>
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index 2dacd6b5..c4668702 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -18,10 +18,10 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-tooltip :open-delay="1000" effect="dark" content="将三表信息传递给零件分配" placement="top">
+        <el-tooltip :open-delay="1000" effect="dark" content="将系统中的三表信息传递到零件分配" placement="top">
           <el-button :loading="listLoading" :disabled="disabled" type="primary" plain icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
         </el-tooltip>
-        <el-tooltip :open-delay="1000" effect="dark" content="删除导入信息" placement="top">
+        <el-tooltip :open-delay="1000" effect="dark" content="删除三表中该组下的所有零件" placement="top">
           <el-button type="danger" plain icon="el-icon-delete" size="small" style="margin-left: 10px" @click="allDelete">一键删除</el-button>
         </el-tooltip>
         <el-row style="margin-top: 10px">
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index 5ca9f071..836fe674 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -30,12 +30,11 @@
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-
             </div>
             <upload-excel-component @on-selected-file="selected"/>
           </div>
           <div>
-            <span v-show="worksheet.length > 1" style="cursor: pointer;width: 100px" @click="removeAll"><i class="el-icon-close"/></span>
+            <span v-show="worksheet.length > 1" style="cursor: pointer;width: 50px" @click="removeAll"><i class="el-icon-close"/></span>
             <el-upload :on-remove="handleRemove" :file-list="itemFile" action=""/>
           </div>
           <div v-if="worksheet.length !== 0" style="float: right;margin: 3px 0">
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index 121014d2..f9e57956 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -18,10 +18,10 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-tooltip content="asdsdr" placement="top" effect="light">
+        <el-tooltip :open-delay="1000" content="将系统中的三表信息传递到零件分配" placement="top" effect="light">
           <el-button :loading="listLoading" :disabled="disabled" type="primary" plain icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
         </el-tooltip>
-        <el-tooltip :open-delay="1000" effect="dark" content="删除三表中导入的信息" placement="top">
+        <el-tooltip :open-delay="1000" effect="dark" content="删除三表中该组下的所有零件" placement="top">
           <el-button type="danger" icon="el-icon-delete" plain size="small" @click="allDelete">一键删除</el-button>
         </el-tooltip>
         <el-row style="margin-top: 5px;margin-bottom: 3px">