From 76b361ddbde25e3673a8657950518babe6d0a372 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Wed, 25 Sep 2019 12:09:41 +0800
Subject: [PATCH] xing

---
 .../index.vue                                    | 14 +++++---------
 .../OwnTimeStatistics/index.vue                  |  2 +-
 .../ProcessQuotaEstablishment/index.vue          | 10 +++++-----
 .../machiningHoursStatistics/index.vue           | 10 +++++++---
 src/views/MarketingCenter/BidBond/index.vue      |  8 ++++----
 src/views/MarketingCenter/CRM/index.vue          |  8 ++++----
 .../ContractCapitalManagement/index.vue          | 16 ++++++++--------
 .../ContractInformationManagement/index.vue      |  8 ++++----
 .../MarketingCenter/InvoiceRecord/index.vue      |  4 ++--
 .../MarketingCenter/PerformanceBond/index.vue    |  6 +++---
 src/views/MarketingCenter/SafetyMargin/index.vue |  8 ++++----
 .../Outsourcing/PreorderAssociation/index.vue    |  6 +++---
 .../PurchasingCenter/FundApproval3/index.vue     |  2 +-
 .../MaterialManagement/index.vue                 |  8 ++++----
 .../PurchasingCenter/PayStateSearch/index.vue    |  2 +-
 .../TechnologyCenter/CreatePackingList/index.vue |  8 ++++++--
 .../TechnologyCenter/ImportChangeParts/index.vue |  4 +++-
 .../ImportChangeParts/specificationData1.vue     | 12 ++++++++----
 src/views/TechnologyCenter/ImportParts/index.vue | 10 +++++-----
 .../ImportParts/specificationData.vue            |  4 ++--
 .../WorkshopProcurement/FundApproval3/index.vue  |  2 +-
 .../InvoiceSettlementApprove1/index.vue          |  2 +-
 22 files changed, 82 insertions(+), 72 deletions(-)

diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index 430294a4..f619d519 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -2,8 +2,7 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span style="margin-left:10px">机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
+        <el-select v-model="machineNumberValue" filterable placeholder="选择机床编号" size="small" style="margin-left: 10px" clearable @change="machineChange()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -13,18 +12,15 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <span>组号:</span>
-        <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
+        <el-select v-model="groupNumberValue" filterable placeholder="选择组号" size="small" style="margin-left: 10px" clearable>
           <el-option
             v-for="item in groupNumber"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>零件:</span>
-        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px" size="small" clearable/>
-        <span>质检类型:</span>
-        <el-select v-model="QualityTypeValue" filterable placeholder="质检类型" size="small" clearable>
+        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px;margin-left: 10px" size="small" clearable/>
+        <el-select v-model="QualityTypeValue" filterable placeholder="质检类型" style="margin-left: 10px" size="small" clearable>
           <el-option
             v-for="item in QualityTypeNumber"
             :key="item.value"
@@ -32,7 +28,7 @@
             :value="item.value"/>
         </el-select>
       </el-row>
-      <el-row style="margin-top: 20px">
+      <el-row style="margin-top: 10px">
         <!--<span class="demonstration">时间区间:</span>-->
         <el-date-picker
           v-model="startTime"
diff --git a/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue b/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue
index c85092e5..9d94fc4f 100644
--- a/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue
+++ b/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue
@@ -35,7 +35,7 @@
       </el-row>
     </el-card>
     <el-card v-loading="loading">
-      <div id="myChart" :style="{width: '100%', height: '470px', margin: 'auto'}"/>
+      <div id="myChart" :style="{width: '100%', height: '570px', margin: 'auto'}"/>
     </el-card>
   </div>
 </template>
diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
index 84714afd..a99bdaa5 100644
--- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card style="margin: 10px">
+    <el-card>
       <el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';Specifications = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
         <el-radio v-model="radio" :label="1" border>未编制</el-radio>
         <el-radio v-model="radio" :label="2" border style="margin-left: 0px">已编制</el-radio>
@@ -65,7 +65,7 @@
             </el-select>
           </el-col>
 
-          <el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="12" >
+          <el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="12" style="width: 60%">
             <span >直&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;径:</span>
             <el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top: 7px"/>
             <span>长度:</span>
@@ -121,7 +121,7 @@
             </el-input>
           </el-col>
 
-          <el-col v-show="materielValue==='5'" :span="20">
+          <el-col v-show="materielValue==='5'" :span="30">
             <span>壁厚:</span>
             <el-input-number v-model="bihou" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
             <span>外径:</span>
@@ -140,7 +140,7 @@
       </div>
     </el-card>
 
-    <el-card style="margin: 10px">
+    <el-card>
       <el-row style="margin-bottom: 10px">
         <span style="margin-left: 10px">输入数值:</span>
         <el-input v-model="numVal" size="small" style="width:100px;margin-top: 3px" placeholder="输入数值"/>
@@ -1674,7 +1674,7 @@ export default {
     background: #f0f9eb;
   }
   .el-card {
-    /*margin-bottom: 15px;*/
+    margin-bottom: 0px;
   }
   .el-date-editor {
     width: 150px
diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index 7c3844e2..c3a8518f 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -21,7 +21,7 @@
           type="date"
           placeholder="选择日期"/>
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
-        <el-tooltip :open-delay="1000" content="一键删除交货期" placement="right">
+        <el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">
           <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet1()">导出</el-button>
         </el-tooltip>
       </el-row>
@@ -128,8 +128,12 @@
           <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
         </el-option>
       </el-select>
-      <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
-      <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet3()">组件导出</el-button>
+      <el-tooltip :open-delay="1000" content="导出机床工时统计明细表" placement="top">
+        <el-button type="warning" size="mini" icon="el-icon-download" plain style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
+      </el-tooltip>
+      <el-tooltip :open-delay="1000" content="导出组件工时统计明细表" placement="top">
+        <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" plain @click="exportUninquirySheet3()">组件导出</el-button>
+      </el-tooltip>
     </el-card>
     <el-card>
       <el-col :span="6">
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index a7b448ea..e2de0028 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -144,7 +144,7 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="收回" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="收回" placement="top">
               <div style="display: inline-block">
                 <el-button
                   :disabled="scope.row.是否禁用"
@@ -154,7 +154,7 @@
                   @click.stop="TakeBack(scope.row);flag1 = 1"/>
               </div>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="履约" placement="top">
+            <el-tooltip :open-delay="1000" class="item" effect="dark" content="转入履约金" placement="top">
               <div style="display: inline-block">
                 <el-button
                   :disabled="scope.row.是否禁用履约"
@@ -165,7 +165,7 @@
                   @click.stop="ComplianceGold(scope.row)"/>
               </div>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+            <el-tooltip :open-delay="1000" class="item" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
                   :disabled="scope.row.是否禁用编辑"
@@ -176,7 +176,7 @@
                   @click.stop="editBidBond(scope.row);flag1 = 3"/>
               </div>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="删除" placement="top">
+            <el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
                 <el-button
                   :disabled="scope.row.是否禁用删除"
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index 74850fff..70c67dcd 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -53,7 +53,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100px" fixed="right">
           <template slot-scope="scope">
-            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+            <el-tooltip :open-delay="1000" class="item" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
                   size="mini"
@@ -62,7 +62,7 @@
                   @click="handleEditMarketingManager(scope.row);flag = 2"/>
               </div>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="删除" placement="top">
+            <el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
                 <el-button
                   size="mini"
@@ -164,7 +164,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" min-width="100px" fixed="right">
               <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                <el-tooltip :open-delay="1000" class="item" effect="dark" content="编辑" placement="top">
                   <div style="display: inline-block">
                     <el-button
                       size="mini"
@@ -173,7 +173,7 @@
                       @click="handleEdit(scope.row);flag1 = 2"/>
                   </div>
                 </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                <el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">
                   <div style="display: inline-block">
                     <el-button
                       size="mini"
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 89f5d5c7..7f10c2ca 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -126,7 +126,7 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="110">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="编辑" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
                   :disabled="scope.row.是否禁用编辑"
@@ -136,7 +136,7 @@
                   @click.stop="EditTableData(scope.row)"/>
               </div>
             </el-tooltip>
-            <el-tooltip effect="dark" content="删除" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
                 <el-button
                   style="margin-left: 20px"
@@ -194,7 +194,7 @@
               </el-table-column>
               <el-table-column label="操作" fixed="right" align="center" width="110">
                 <template slot-scope="scope">
-                  <el-tooltip effect="dark" content="编辑" placement="top">
+                  <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
                     <div style="display: inline-block">
                       <el-button
                         size="mini"
@@ -203,7 +203,7 @@
                         @click="handleEdit2(scope.row);flag = 2"/>
                     </div>
                   </el-tooltip>
-                  <el-tooltip effect="dark" content="删除" placement="top">
+                  <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
                     <div style="display: inline-block">
                       <el-button
                         size="mini"
@@ -287,7 +287,7 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="110">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="收款" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="收款" placement="top">
               <div style="display: inline-block">
                 <el-button
                   :disabled="scope.row.是否禁用收款"
@@ -297,7 +297,7 @@
                   @click="handleEdit1(scope.row);flag=1"/>
               </div>
             </el-tooltip>
-            <el-tooltip effect="dark" content="收款转移" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="收款转移" placement="top">
               <div style="display: inline-block">
                 <el-button
                   :disabled="scope.row.是否禁用"
@@ -512,7 +512,7 @@
         </el-table-column>
         <el-table-column property="date" label="操作" align="center" width="130px">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="立即收款" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="立即收款" placement="top">
               <div style="display: inline-block">
                 <el-button
                   size="mini"
@@ -521,7 +521,7 @@
                   @click="Detail(scope.row)"/>
               </div>
             </el-tooltip>
-            <el-tooltip effect="dark" content="不再提醒" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="不再提醒" placement="top">
               <div style="display: inline-block">
                 <el-button
                   size="mini"
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 7c4a51fd..3fd474f3 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -70,7 +70,7 @@
               </el-table-column>
               <el-table-column label="操作" width="100" align="center">
                 <template slot-scope="scope">
-                  <el-tooltip effect="dark" content="编辑" placement="top">
+                  <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
                     <div style="display: inline-block">
                       <el-button
                         size="mini"
@@ -79,7 +79,7 @@
                         @click="editMachine(scope.row);flag = 2"/>
                     </div>
                   </el-tooltip>
-                  <el-tooltip effect="dark" content="删除" placement="top">
+                  <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
                     <div style="display: inline-block">
                       <el-button
                         size="mini"
@@ -181,7 +181,7 @@
               type="text"
               icon="el-icon-circle-plus-outline"
               @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
-            <el-tooltip effect="dark" content="编辑" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
                   size="mini"
@@ -191,7 +191,7 @@
                   @click.stop="handleEdit(scope.row)"/>
               </div>
             </el-tooltip>
-            <el-tooltip effect="dark" content="删除" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
                 <el-button
                   size="mini"
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index f0985794..8c046a71 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -180,7 +180,7 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="130">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="编辑" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
                   size="mini"
@@ -189,7 +189,7 @@
                   @click.stop="openEditInvoiceRecordingDialog(scope.row); flag = 2"/>
               </div>
             </el-tooltip>
-            <el-tooltip effect="dark" content="删除" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
                 <el-button
                   size="mini"
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 0b806920..c888689c 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -182,7 +182,7 @@
               </el-table-column>
               <el-table-column label="操作" fixed="right" align="center" width="200px">
                 <template slot-scope="scope">
-                  <el-tooltip class="item" effect="dark" content="收回" placement="top">
+                  <el-tooltip :open-delay="1000" class="item" effect="dark" content="收回" placement="top">
                     <div style="display: inline-block">
                       <el-button
                         :disabled="scope.row.是否禁用收回"
@@ -192,7 +192,7 @@
                         @click.stop="takeBack(scope.row)"/>
                     </div>
                   </el-tooltip>
-                  <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                  <el-tooltip :open-delay="1000" class="item" effect="dark" content="编辑" placement="top">
                     <div style="display: inline-block">
                       <el-button
                         :disabled="scope.row.是否禁用编辑"
@@ -203,7 +203,7 @@
                         @click.stop="openEditPerformanceBondDialog(scope.row); flag = 2"/>
                     </div>
                   </el-tooltip>
-                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                  <el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">
                     <div style="display: inline-block">
                       <el-button
                         :disabled="scope.row.是否禁用删除"
diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue
index 2cbf5d48..fdb43e57 100644
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -211,7 +211,7 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template slot-scope="scope">
-            <el-tooltip class="item" effect="dark" content="收回" placement="top">
+            <el-tooltip :open-delay="1000" class="item" effect="dark" content="收回" placement="top">
               <div style="display: inline-block">
                 <el-button
                   :disabled="scope.row.是否禁用收回"
@@ -221,7 +221,7 @@
                   @click.stop="TakeBack(scope.row);flag1 = 5"/>
               </div>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="扣款" placement="top">
+            <el-tooltip :open-delay="1000" class="item" effect="dark" content="扣款" placement="top">
               <div style="display: inline-block">
                 <el-button
                   :disabled="scope.row.是否禁用扣款"
@@ -232,7 +232,7 @@
                   @click.stop="Withdrawing(scope.row);flag1 = 3"/>
               </div>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+            <el-tooltip :open-delay="1000" class="item" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
                   :disabled="scope.row.是否禁用编辑"
@@ -243,7 +243,7 @@
                   @click.stop="editSafetyMargin(scope.row);flag1 = 2"/>
               </div>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="删除" placement="top">
+            <el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
                 <el-button
                   :disabled="scope.row.是否禁用删除"
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index bb9914c1..ed9f9e7d 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -102,12 +102,12 @@
             <el-tag v-if="parseInt(scope.row.工序状态)===5" size="small">停产</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="序间外协" width="75" align="center">
+        <el-table-column label="是否外协" width="75" align="center">
           <template slot-scope="scope">
-            <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
+            <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)"/>
           </template>
         </el-table-column>
-        <el-table-column label="是否外协" width="120" align="center">
+        <el-table-column label="外协状态" width="75" align="center">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">是</el-tag>
             <el-tag v-else size="small">否</el-tag>
diff --git a/src/views/PurchasingCenter/FundApproval3/index.vue b/src/views/PurchasingCenter/FundApproval3/index.vue
index da8440da..0c0738c5 100644
--- a/src/views/PurchasingCenter/FundApproval3/index.vue
+++ b/src/views/PurchasingCenter/FundApproval3/index.vue
@@ -364,7 +364,7 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-select{
     width:200px
diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue
index 00833d26..de9f9982 100644
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -36,7 +36,7 @@
           <span>物料名称:</span>
           <el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable />
         </el-col>
-        <el-col style="width: 280px;margin-top: 3px">
+        <el-col style="width: 280px;margin-top: 10px">
           <span>物料全称:</span>
           <el-input
             v-model="FullNameOfMaterial"
@@ -44,7 +44,7 @@
             size="small"
             clearable/>
         </el-col>
-        <el-col style="width: 280px;margin-top: 3px">
+        <el-col style="width: 280px;margin-top: 10px">
           <span>物料规格:</span>
           <el-input
             v-model="MaterialSpecification"
@@ -52,7 +52,7 @@
             size="small"
             clearable/>
         </el-col>
-        <el-col style="width: 280px;margin-top: 3px">
+        <el-col style="width: 280px;margin-top: 10px">
           <span>物料型号:</span>
           <el-input
             v-model="MaterialModel"
@@ -157,7 +157,7 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="150">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="编辑" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑">
               <div style="display: inline-block">
                 <el-button
                   :disabled="token !== 11 && token !== 36"
diff --git a/src/views/PurchasingCenter/PayStateSearch/index.vue b/src/views/PurchasingCenter/PayStateSearch/index.vue
index fcd5ddb0..3026cfb7 100644
--- a/src/views/PurchasingCenter/PayStateSearch/index.vue
+++ b/src/views/PurchasingCenter/PayStateSearch/index.vue
@@ -23,7 +23,7 @@
           @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
       </div>
       <el-table v-loading="" :data="tableData1" stripe border style="width: 100%;max-height: 500px;" height="500px" size="mini">
-        <el-table-column type="expand">
+        <el-table-column type="expand" label="详情" align="center">
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
               <el-row>
diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue
index 12f947e2..3d0db642 100644
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
@@ -9,8 +9,12 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">增加</el-button>
-      <el-button type="warning" size="small" style="margin-left: 10px" icon="el-icon-download" @click="exportTable()">导出</el-button>
+      <el-tooltip :open-delay="1000" effect="dark" content="新增项目装箱单" placement="top">
+        <el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">新增</el-button>
+      </el-tooltip>
+      <el-tooltip :open-delay="1000" effect="dark" content="打印装箱单" placement="top">
+        <el-button type="warning" size="small" style="margin-left: 10px" icon="el-icon-download" @click="exportTable()">导出</el-button>
+      </el-tooltip>
       <el-table
         v-loading="loading"
         :data="receiptData"
diff --git a/src/views/TechnologyCenter/ImportChangeParts/index.vue b/src/views/TechnologyCenter/ImportChangeParts/index.vue
index 127e09ed..fba6aa76 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/index.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/index.vue
@@ -30,7 +30,9 @@
           <el-upload :on-remove="handleRemove" :file-list="itemFile" action=""/>
         </div>
         <div v-if="worksheet.length !== 0" style="float: right;margin: 20px 0">
-          <el-button :disabled="disabled" icon="el-icon-upload2" type="primary" size="small" @click="basicPartsToSQL">导入到数据库</el-button>
+          <el-tooltip :open-delay="1000" effect="dark" content="将信息存入系统数据库" placement="top">
+            <el-button :disabled="disabled" icon="el-icon-upload2" type="primary" size="small" @click="basicPartsToSQL">导入到数据库</el-button>
+          </el-tooltip>
         </div>
       </div>
     </el-card>
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index c974f7e3..fa7b4f33 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -3,7 +3,7 @@
     <el-card>
       <div style="width: 900px;margin: 3px auto">
         <span>机床名称：</span>
-        <el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" @change="getGroups">
+        <el-select v-model="machineValue" filterable clearable size="small" style="width: 200px;" placeholder="机床名称" @change="getGroups">
           <el-option
             v-for="item in machineNames"
             :key="item.value"
@@ -11,15 +11,19 @@
             :value="item.value"/>
         </el-select>
         <span style="margin-left: 10px">分组名称：</span>
-        <el-select v-model="groupValue" filterable clearable size="small" placeholder="分组名称">
+        <el-select v-model="groupValue" filterable clearable size="small" style="width: 200px;" placeholder="分组名称">
           <el-option
             v-for="item in groupsNames"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <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-button type="danger" plain icon="el-icon-delete" size="small" style="margin-left: 10px" @click="allDelete">一键删除</el-button>
+        <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-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">
           <span>机床名称：</span>
           <el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/>
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index e338bb96..2ca0e639 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -13,7 +13,7 @@
       <el-col :span="6">
         <div style="width: 650px;margin: 0">
           <div style="overflow: hidden">
-            <div style="margin-bottom: 10px;">
+            <div style="margin-bottom: 0px;">
               <span>项目：</span>
               <el-select v-model="projectValue" filterable size="small" placeholder="项目名称" style="margin-top: 3px">
                 <el-option
@@ -30,14 +30,14 @@
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-              <el-button type="primary" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
+              <el-tooltip :open-delay="1000" effect="dark" content="上传项目设计总图" placement="top">
+                <el-button type="primary" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
+              </el-tooltip>
             </div>
             <upload-excel-component @on-selected-file="selected"/>
           </div>
           <div>
-            <el-tooltip content="删除全部" placement="top">
-              <span v-show="worksheet.length > 1" style="cursor: pointer;float: right;margin: 5px" @click="removeAll"><i class="el-icon-close"/></span>
-            </el-tooltip>
+            <span v-show="worksheet.length > 1" style="cursor: pointer;width: 100px" @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 3049d747..f9b98680 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -3,7 +3,7 @@
     <el-card>
       <div style="width: 900px;margin: 0 auto">
         <span>机床名称：</span>
-        <el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" style="margin-top: 3px" @change="getGroups">
+        <el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" style="margin-top: 3px;width: 200px;" @change="getGroups">
           <el-option
             v-for="item in machineNames"
             :key="item.value"
@@ -11,7 +11,7 @@
             :value="item.value"/>
         </el-select>
         <span>分组名称：</span>
-        <el-select v-model="groupValue" filterable clearable size="small" placeholder="分组名称">
+        <el-select v-model="groupValue" filterable clearable size="small" placeholder="分组名称" style="width: 200px;">
           <el-option
             v-for="item in groupsNames"
             :key="item.value"
diff --git a/src/views/WorkshopProcurement/FundApproval3/index.vue b/src/views/WorkshopProcurement/FundApproval3/index.vue
index f2879d0d..36bb9fd7 100644
--- a/src/views/WorkshopProcurement/FundApproval3/index.vue
+++ b/src/views/WorkshopProcurement/FundApproval3/index.vue
@@ -404,7 +404,7 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-select{
     width:200px
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
index 19ddec39..bda0aa13 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
@@ -263,7 +263,7 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-select{
     width:200px