diff --git a/src/api/ManufacturingCenter/ParseQuery.js b/src/api/ManufacturingCenter/ParseQuery.js
index 02939a0c..b6f299f8 100644
--- a/src/api/ManufacturingCenter/ParseQuery.js
+++ b/src/api/ManufacturingCenter/ParseQuery.js
@@ -43,3 +43,14 @@ export function searchMachine() {
     }
   })
 }
+export function searchAll() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '1_总查询',
+      param: '机床流水号=' + arguments[0]
+    }
+  })
+}
diff --git a/src/assets/img/img14.png b/src/assets/img/img14.png
new file mode 100644
index 00000000..04004607
Binary files /dev/null and b/src/assets/img/img14.png differ
diff --git a/src/assets/img/img15.png b/src/assets/img/img15.png
new file mode 100644
index 00000000..a7430deb
Binary files /dev/null and b/src/assets/img/img15.png differ
diff --git a/src/utils/request.js b/src/utils/request.js
index d440babd..375bf45a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,8 +23,11 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
+<<<<<<< HEAD
   baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`,
+=======
+  baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
+>>>>>>> e3035b1d55444222c4f068bc3cd159ea6cd21458
   timeout: 1500000 // 请求超时时间
 })
-
 export default service
diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index 79f3c16c..e39c5c70 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -49,7 +49,7 @@
         </el-table-column>
         <el-table-column label="装配开始时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.机床装配开始时间 }}
+            {{ scope.row.机床装配实际开始时间 }}
           </template>
         </el-table-column>
         <el-table-column label="装配结束时间" align="center">
@@ -131,7 +131,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="300px" fixed="right">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="编辑部装工时" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="编辑部装工时" placement="top">
               <el-button v-if="!scope.row.isEditing" type="primary" plain size="small" @click="editTable2(scope.row)">编辑</el-button>
             </el-tooltip>
             <el-button v-if="scope.row.isEditing" type="primary" plain size="small" @click="submitTable2(scope.row)">确定</el-button>
diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue
index f6475a73..ccc0d7d8 100644
--- a/src/views/Assembly/AssemblyQualityInspection/index.vue
+++ b/src/views/Assembly/AssemblyQualityInspection/index.vue
@@ -34,7 +34,7 @@
             :value="item.value"/>
         </el-select>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
-        <el-tooltip effect="dark" content="导出查询数据" placement="top" open-delay="1000">
+        <el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
           <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
         </el-tooltip>
       </el-row>
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index b413ecb5..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"
@@ -66,7 +62,7 @@
             :value="item.value"/>
         </el-select>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
-        <el-tooltip effect="dark" content="导出查询数据" placement="top" open-delay="1000">
+        <el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
           <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
         </el-tooltip>
       </el-row>
diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue
index a0a3f650..afa13d52 100644
--- a/src/views/Assembly/SparePartsOutStockRecord/index.vue
+++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue
@@ -39,7 +39,7 @@
           style="width: 130px"
           type="date"
           placeholder="选择日期"/>
-        <el-tooltip effect="dark" content="查询备料出库记录" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="查询备料出库记录" placement="top">
           <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=20; pageCurrent=1;selecttable()">查询</el-button>
         </el-tooltip>
       </el-row>
diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue
index 783436aa..25233287 100644
--- a/src/views/BasicData/PartsNumberMaintenance/index.vue
+++ b/src/views/BasicData/PartsNumberMaintenance/index.vue
@@ -35,7 +35,7 @@
     <el-card>
       <div>
         <span style="font-size: 20px">基本件三表数量</span>
-        <el-tooltip effect="dark" content="删除基本件三表数量" placement="top" open-delay="1000">
+        <el-tooltip :open-delay="1000" effect="dark" content="删除基本件三表数量" placement="top">
           <el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
         </el-tooltip>
       </div>
@@ -125,7 +125,7 @@
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template slot-scope="scope">
 
-            <el-tooltip effect="dark" content="编辑零件数量" placement="top" open-delay="1000">
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑零件数量" placement="top">
               <el-button
                 size="mini"
                 type="primary"
@@ -133,7 +133,7 @@
                 icon="el-icon-edit"
                 @click="type=1;handleEdit(scope.row)">编辑</el-button>
             </el-tooltip>
-            <el-tooltip effect="dark" content="删除该行" placement="top" open-delay="1000">
+            <el-tooltip :open-delay="1000" effect="dark" content="删除该行" placement="top">
               <el-button
                 size="mini"
                 type="danger"
@@ -158,7 +158,7 @@
     <el-card>
       <div>
         <span style="font-size: 20px">外购件和标准件三表数量</span>
-        <el-tooltip effect="dark" content="删除外购件和标准件数量" placement="top" open-delay="1000">
+        <el-tooltip :open-delay="1000" effect="dark" content="删除外购件和标准件数量" placement="top">
           <el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
         </el-tooltip>
       </div>
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/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index 6ccef91b..7c7a2d3a 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -198,7 +198,7 @@
         <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="createList()">创建</el-button>
       </div>
       <span style="margin:0;width: 100px;font-size: 20px">领料单</span>
-      <el-tooltip effect="dark" content="为所选领料单增加物料明细" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="为所选领料单增加物料明细" placement="top">
         <el-button size="small" type="primary" icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入</el-button>
       </el-tooltip>
       <el-table :data="pickListTable1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index 5befe324..c272bd0a 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -5,10 +5,10 @@
         <span style="margin-left: 10px">零件图号</span>
         <el-input v-model="Partpaint" clearable size="small" style="width:200px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
         <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
-        <el-tooltip effect="dark" content="清除所有机床零件信息" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="清除所有机床零件信息" placement="top">
           <el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" plain @click="Empty()">清空</el-button>
         </el-tooltip>
-        <el-tooltip effect="dark" content="将所有机床零件入库" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="将所有机床零件入库" placement="top">
           <el-button type="warning" size="small" class="el-icon-success" style="margin: 0 0 0 10px" plain @click="Innumber">入库</el-button>
         </el-tooltip>
       </el-row>
@@ -83,7 +83,7 @@
         </el-table-column>
         <el-table-column label="操作" min-width="100" align="center">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="清除该条零件信息" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="清除该条零件信息" placement="top">
               <el-button
                 :disabled="scope.row.是否禁用"
                 size="mini"
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index d31cc62e..6a831d73 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -3,45 +3,35 @@
     <el-card>
       <div slot="header">
         <el-row style="margin-bottom:-10px!important;">
-          <el-col style="width: 250px">
-            <span>物料名称:</span>
-            <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
-          </el-col>
-          <el-col style="width: 250px">
-            <span>物料规格:</span>
-            <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>
-          </el-col>
-          <el-col style="width: 250px">
-            <span>物料型号:</span>
-            <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>
-          </el-col>
-          <el-col style="width: 250px">
-            <span>仓库名称:</span>
-            <el-select v-model="inventoryNameValue" style="margin-bottom: 10px;" size="small" clearable @change="getLocate">
-              <el-option
-                v-for="item in inventoryName"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-col>
-          <el-col style="width: 250px">
-            <span>货位名称:</span>
-            <el-select v-model="locateNameValue" style="margin-bottom: 10px;" size="small" clearable>
-              <el-option
-                v-for="item in locateName"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-col>
-          <el-col style="width: 170px">
-            <el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
-            <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
-          </el-col>
+          <span>物料名称:</span>
+          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
+          <span>物料规格:</span>
+          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>
+          <span>物料型号:</span>
+          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>
+          <span>仓库名称:</span>
+          <el-select v-model="inventoryNameValue" style="margin-bottom: 10px;" size="small" clearable @change="getLocate">
+            <el-option
+              v-for="item in inventoryName"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-row>
+        <el-row>
+          <span>货位名称:</span>
+          <el-select v-model="locateNameValue" style="margin-top: 10px;" size="small" clearable>
+            <el-option
+              v-for="item in locateName"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
         </el-row>
       </div>
-      <el-table :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" show-summary>
+      <el-table :data="tableData1" stripe border style="max-height: 500px;" height="500px" size="mini" show-summary>
         <el-table-column label="名称" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -118,7 +108,7 @@
           <el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent01=1;pageSize01=10;searchMaterial01()">查询</el-button>
         </el-col>
       </el-row>
-      <el-table :data="tableData01" border highlight-current-row height="300" size="mini" style="margin-bottom: 10px" @row-click="selectMaterial">
+      <el-table :data="tableData01" border stripe highlight-current-row height="300" size="mini" style="margin-bottom: 10px" @row-click="selectMaterial">
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index 8d04d4ad..94a03d5f 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -4,7 +4,7 @@
       <div slot="header" class="clearfix">
         <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADD()">新建仓库</el-button>
       </div>
-      <el-table :data="tableData" border size="mini" style="width: 100%;max-height: 300px" height="300" @row-click="getWarehouse">
+      <el-table :data="tableData" border stripe size="mini" style="width: 100%;max-height: 300px" height="300" @row-click="getWarehouse">
         <el-table-column label="仓库编号" align="center" width="90" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.仓库编号 }}
@@ -49,13 +49,13 @@
               plain
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
-            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" plain style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
     <el-card>
-      <el-table v-loading="listLoading" :data="tableData2" border size="mini" style="width: 100%;max-height: 300px" height="300">
+      <el-table v-loading="listLoading" :data="tableData2" border stripe size="mini" style="width: 100%;max-height: 300px" height="300">
         <el-table-column label="货位名称" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.货位名称 }}
@@ -92,11 +92,13 @@
               size="mini"
               icon="el-icon-edit"
               type="primary"
+              plain
               @click="handleLocateEdit(scope.row)">修改</el-button>
             <el-button
               size="mini"
               type="danger"
               icon="el-icon-delete"
+              plain
               @click="locateDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -587,7 +589,7 @@ export default {
     height: auto!important;
   }
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-select{
     width:200px
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index e4a46494..b4561956 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -13,7 +13,7 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border style="width: 100%;" height="440" @row-click="searchoutRecord">
+      <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="440" @row-click="searchoutRecord">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="物料名称" align="center" min-width="120">
           <template slot-scope="scope">
@@ -66,7 +66,7 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="listLoading1" :data="tableDataOut" size="mini" border style="width: 100%;" height="250">
+      <el-table v-loading="listLoading1" :data="tableDataOut" size="mini" stripe border style="width: 100%;" height="250">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="物料名称" align="center" min-width="80">
           <template slot-scope="scope">
diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue
index 8c7b7d11..a38cd6ee 100644
--- a/src/views/Inventory/PurchaseInRecord/index.vue
+++ b/src/views/Inventory/PurchaseInRecord/index.vue
@@ -49,7 +49,7 @@
         </el-row>
       </div>
       <h4 style="margin-top: 0">采购合同件</h4>
-      <el-table :data="tableData1" border size="mini" style="width: 100%;" height="400">
+      <el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="400">
         <el-table-column label="名称" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
@@ -93,7 +93,7 @@
           @current-change="handleCurrentChange1"/>
       </div>
       <h4>离线合同件</h4>
-      <el-table :data="tableData2" border size="mini" style="width: 100%;" height="400">
+      <el-table :data="tableData2" border stripe size="mini" style="width: 100%;" height="400">
         <el-table-column label="名称" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue
index a38243fd..cd532135 100644
--- a/src/views/Inventory/PurchaseOutRecord/index.vue
+++ b/src/views/Inventory/PurchaseOutRecord/index.vue
@@ -63,7 +63,7 @@
           <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;searchRecord()">查询</el-button>
         </el-row>
       </div>
-      <el-table :data="tableData" border size="mini" style="width: 100%;" height="600">
+      <el-table :data="tableData" border stripe size="mini" style="width: 100%;" height="600">
         <el-table-column label="名称" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
index 6178a82c..01f763f2 100644
--- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
+++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
@@ -43,7 +43,7 @@
         <span>工艺名称:</span>
         <el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:200px"/>
         <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 effect="dark" content="新增补录工时" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="新增补录工时" placement="top">
           <el-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button>
         </el-tooltip>
       </el-row>
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 2c38a458..8f23d390 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -5,14 +5,18 @@
         <span>零件图号:</span>
         <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
         <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
+        <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
+          <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
+        </el-tooltip>
+        <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
         <el-tooltip effect="dark" content="打印备料单" placement="top" open-delay="1200">
           <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button>
         </el-tooltip>
-        <el-tooltip effect="dark" content="将选中零件分配为自家备料" placement="top" open-delay="1200">
-          <el-button type="info" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
+        <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
+          <el-button type="warning" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit()">自家备料</el-button>
         </el-tooltip>
-        <el-tooltip effect="dark" content="将选中零件分配为外购备料" placement="top" open-delay="1200">
-          <el-button type="warning" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
+        <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
+          <el-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit2()">外购备料</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
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 787ed697..69cd60fc 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -192,13 +192,13 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
           <!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
-          <el-tooltip effect="dark" content="打回到零件分配" placement="top" open-delay="1200">
+          <el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
             <el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button>
           </el-tooltip>
-          <el-tooltip effect="dark" content="选中零件进行投产" placement="top" open-delay="1200">
+          <el-tooltip :open-delay="1200" effect="dark" content="选中零件进行投产" placement="top">
             <el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button>
           </el-tooltip>
-          <el-tooltip effect="dark" content="将不同组号中相同图号的零件合并" placement="top" open-delay="1200">
+          <el-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top">
             <el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
           </el-tooltip>
         </div>
@@ -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/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index a00a566d..26528d60 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -271,19 +271,19 @@
         <el-table-column label="操作" width="490px" align="center">
           <template slot-scope="scope">
             <div>
-              <el-tooltip effect="dark" content="上移" placement="top" open-delay="1200">
+              <el-tooltip :open-delay="1200" effect="dark" content="上移" placement="top">
                 <el-button size="mini" icon="el-icon-arrow-up" type="primary" plain @click="upOne(scope.row)"/>
               </el-tooltip>
-              <el-tooltip effect="dark" content="下移" placement="top" open-delay="1200">
+              <el-tooltip :open-delay="1200" effect="dark" content="下移" placement="top">
                 <el-button size="mini" icon="el-icon-arrow-down" type="primary" plain @click="downOne(scope.row)"/>
               </el-tooltip>
-              <el-tooltip effect="dark" content="置顶" placement="top" open-delay="1200">
+              <el-tooltip :open-delay="1200" effect="dark" content="置顶" placement="top">
                 <el-button size="mini" icon="el-icon-upload2" type="primary" plain @click="TOP(scope.row)"/>
               </el-tooltip>
-              <el-tooltip effect="dark" content="置底" placement="top" open-delay="1200">
+              <el-tooltip :open-delay="1200" effect="dark" content="置底" placement="top">
                 <el-button size="mini" icon="el-icon-download" type="primary" plain @click="Down(scope.row)"/>
               </el-tooltip>
-              <el-tooltip effect="dark" content="删除" placement="top" open-delay="1200">
+              <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
                 <el-button size="mini" icon="el-icon-delete" type="danger" plain @click="outParts(scope.row)"/>
               </el-tooltip>
             </div>
diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index 0fd90e85..30e4a4c3 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -22,13 +22,13 @@
       </el-select>
       <span>零件图号:</span>
       <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
-      <el-tooltip effect="dark" content="自家备料查询" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="自家备料查询" placement="top">
         <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
       </el-tooltip>
-      <el-tooltip effect="dark" content="自家备料完成" placement="top" open-delay="1200">
-        <el-button size="small" icon="el-icon-success" type="info" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
+      <el-tooltip :open-delay="1200" effect="dark" content="自家备料完成" placement="top">
+        <el-button size="small" icon="el-icon-success" type="warning" plain style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
       </el-tooltip>
-      <el-tooltip effect="dark" content="将备料件打回重新分配" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="将备料件打回重新分配" placement="top">
         <el-button size="small" icon="el-icon-success" type="danger" style="margin-left: 10px" @click="back()">打回</el-button>
       </el-tooltip>
     </el-card>
@@ -68,10 +68,10 @@
     <el-card>
       <span>零件图号:</span>
       <el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
-      <el-tooltip effect="dark" content="外购备料确认" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="外购备料确认" placement="top">
         <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">查询</el-button>
       </el-tooltip>
-      <el-tooltip effect="dark" content="外购备料完成" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="外购备料完成" placement="top">
         <el-button size="small" icon="el-icon-success" type="warning" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
       </el-tooltip>
     </el-card>
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/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue
index 8bd20783..d0f63127 100644
--- a/src/views/ManufacturingCenter/ParseQuery/index.vue
+++ b/src/views/ManufacturingCenter/ParseQuery/index.vue
@@ -4,141 +4,135 @@
       <div class="main">
         <div class="process" @click.stop="chaxun">
           <div id="son" :class="[isActive ? color[22] : 'weikaishi']" class="module" style="position: relative;left: 1588px;top:190px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：装配部<br>根据营销部门发出发货请求，<br>装配部进行发货</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[22] : 'weikaishi']" type="text" @click.stop="searchDiv23">发货<br>{{ `${data[0].发货百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[22] : 'weikaishi']" type="text" @click.stop="searchDiv23">发货</el-button>
             </el-tooltip>
           </div>
           <div id="son1" :class="[isActive ? color[21] : 'weikaishi']" class="module" style="position: relative;left: 1400px;top:190px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：质检部<br>对机床进行总装调试</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试<br>{{ `${data[0].总装调试百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试</el-button>
             </el-tooltip>
           </div>
           <div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1210px;top:190px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：质检部<br>对机床重要部件进行检测</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data[0].装配质检百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data2[0].装配质检}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 1005px;top:62px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：电气部<br>电气部长制定装配计划，<br>并记录计划执行情况</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[19] : 'weikaishi']" type="text" @click.stop="searchDiv6">电气装配<br>{{ `${data[0].电气装配百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[19] : 'weikaishi']" type="text" @click.stop="searchDiv6">电气装配<br>{{ `${data2[0].电气装配}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son4" :class="[isActive ? color[18] : 'weikaishi']" class="module" style="position: relative;left: 920px;top:140px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content"><br>角色：装配部长<br>装配部长制定装配计划，<br>并记录计划执行情况</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[18] : 'weikaishi']" type="text" @click.stop="searchDiv5">机械装配<br>{{ `${data[0].机械装配百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[18] : 'weikaishi']" type="text" @click.stop="searchDiv5">机械装配<br>{{ `${data2[0].机械装配}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son5" :class="[isActive ? color[17] : 'weikaishi']" class="module" style="position: relative;left: 835px;top:220px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：冷作车间主任<br>冷作车间主任制定冷作计划，<br>并记录计划执行情况</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[17] : 'weikaishi']" type="text" @click.stop="searchDiv7">冷作<br>{{ `${data[0].冷作百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[17] : 'weikaishi']" type="text" @click.stop="searchDiv7">冷作<br>{{ `${data2[0].冷作}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son6" :class="[isActive ? color[16] : 'weikaishi']" class="module" style="position: relative;left: 750px;top:300px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：油漆车间主任<br>油漆车间主任制定装配计划，<br>并记录计划执行情况</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[16] : 'weikaishi']" type="text" @click.stop="searchDiv8">油漆<br>{{ `${data[0].油漆百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[16] : 'weikaishi']" type="text" @click.stop="searchDiv8">油漆<br>{{ `${data2[0].油漆}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son7" :class="[isActive ? color[15] : 'weikaishi']" class="module" style="position: relative;left: 544px;top:190px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：装配部长<br>此模块用于查询某机床是否达到装配条件，<br>即采购件与自制件是否成组配套</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[15] : 'weikaishi']" type="text" @click.stop="searchDiv9">成组配套<br>{{ `${data[0].成组配套百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[15] : 'weikaishi']" type="text" @click.stop="searchDiv9">成组配套<br>{{ `${data2[0].成组配套}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 321px;top:95px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：质检部<br>对自制件进行检测</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data[0].自制质检百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data2[0].自制质检}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 240px;top:286px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：质检部<br>对采购件进行检测</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data[0].采购质检百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data2[0].采购质检}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son10" :class="[isActive ? color[12] : 'weikaishi']" class="module" style="position: relative;left: 30px;top:155px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：金工车间<br>接收加工任务并使用<br>MES工作站进行报工</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[12] : 'weikaishi']" type="text" @click.stop="searchDiv10">车间加工<br>{{ `${data[0].车间加工百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[12] : 'weikaishi']" type="text" @click.stop="searchDiv10">车间加工<br>{{ `${data2[0].车间加工}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son11" :class="[isActive ? color[11] : 'weikaishi']" class="module" style="position: relative;left: -133px;top:33px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：外协员<br>进行外协加工</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[11] : 'weikaishi']" type="text" @click.stop="searchDiv18">工序外协<br>{{ `${data[0].工序外协百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[11] : 'weikaishi']" type="text" @click.stop="searchDiv18">工序外协<br>{{ `${data2[0].外协}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son12" :class="[isActive ? color[10] : 'weikaishi']" class="module" style="position: relative;left: -335px;top:94px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：计划员<br>针对做完工艺定额的零件进行排查</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[10] : 'weikaishi']" type="text" @click.stop="searchDiv15">能力平衡<br>{{ `${data[0].能力平衡百分比}%` }}</el-button>
-            </el-tooltip>
-          </div>
-          <div v-show="false" id="son13" :class="[isActive ? color[9] : 'weikaishi']" class="module" style="position: relative;left: -420px;top:94px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：工艺部<br>制定零件定额</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[9] : 'weikaishi']" type="text" @click.stop="searchDiv14">定额<br>{{ `${data[0].定额百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[10] : 'weikaishi']" type="text" @click.stop="searchDiv15">能力平衡<br>{{ `${data2[0].能力平衡}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son14" :class="[isActive ? color[8] : 'weikaishi']" class="module" style="position: relative;left: -520px;top:93px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：工艺部<br>制定零件工艺</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[8] : 'weikaishi']" type="text" @click.stop="searchDiv13">工艺<br>{{ `${data[0].工艺百分比}%` }}</el-button>
+            <el-tooltip :open-delay="600" placement="top">
+              <div slot="content">角色：工艺部<br>制定零件工艺定额</div>
+              <el-button :disabled="disabled" :class="[isActive ? color[8] : 'weikaishi']" type="text" @click.stop="searchDiv13">工艺定额<br>{{ `${data2[0].工艺定额}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son15" :class="[isActive ? color[7] : 'weikaishi']" class="module" style="position: relative;left: -728px;top:33px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：下料员<br>对于钢板等自家备料<br>下料员需要在系统确认备料<br>并通知金工领料</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[7] : 'weikaishi']" type="text" @click.stop="searchDiv11">自家备料<br>{{ `${data[0].自家备料百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[7] : 'weikaishi']" type="text" @click.stop="searchDiv11">自家备料<br>{{ `${data2[0].自家备料}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1255px;top:236px; width: 80px;height: 48px;">
             <!--<el-tooltip placement="top">-->
             <!--<div slot="content">角色：营销内勤<br>负责创建项目及机床的基础信息，<br>此部分作为系统数据的源头</div>-->
             <!--</el-tooltip>-->
-            <el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button>
+            <el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ `${data2[0].签订合同}%` }}</el-button>
           </div>
           <div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1240px;top:236px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：技术员<br>负责导入三表(零件)，<br>组件在项目启动会时提出，<br>由制造总监导入</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[1] : 'weikaishi']" type="text" @click.stop="searchDiv2">产品设计<br>{{ `${data[0].产品设计百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[1] : 'weikaishi']" type="text" @click.stop="searchDiv2">产品设计<br>{{ `${data2[0].产品设计}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son18" :class="[isActive ? color[6] : 'weikaishi']" class="module" style="position: relative;left: -980px;top:155px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：下料员<br>外购物料到货后，由下料员确认备料，<br>并通知金工领料</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[6] : 'weikaishi']" type="text" @click.stop="searchDiv20">外购备料<br>{{ `${data[0].外购备料百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[6] : 'weikaishi']" type="text" @click.stop="searchDiv20">外购备料<br>{{ `${data2[0].外购备料}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son19" :class="[isActive ? color[2] : 'weikaishi']" class="module" style="position: relative;left: -1311px;top:236px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：计划员<br>计划员负责将三表中的零件按实际情况分配为：<br>自制件、采购部采购件、制造部采购件三类</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[2] : 'weikaishi']" type="text" @click.stop="searchDiv3">零件分配<br>{{ `${data[0].零件分配百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[2] : 'weikaishi']" type="text" @click.stop="searchDiv3">零件分配<br>{{ `${data2[0].零件分配}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son20" :class="[isActive ? color[3] : 'weikaishi']" class="module" style="position: relative;left: -1269px;top:103px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：计划员<br>计划员分配零件后，<br>在生产计划下达模块<br>可查看到自家加工的零件任务，<br>计划员需要将这些零件投产</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[3] : 'weikaishi']" type="text" @click.stop="searchDiv4">自制件<br>{{ `${data[0].自制件百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[3] : 'weikaishi']" type="text" @click.stop="searchDiv4">自制件<br>{{ `${data2[0].自制件}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -1354px;top:236px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：制造部长<br>计划员分配零件后，<br>将分配到制造部的采购件进行采购</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data[0].车间采购百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data2[0].车间采购}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -1438px;top:328px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
+            <el-tooltip :open-delay="600" placement="top">
               <div slot="content">角色：采购部<br>计划员分配零件后，<br>将分配到采购部的采购件进行采购</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[4] : 'weikaishi']" type="text" @click.stop="searchDiv16">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[4] : 'weikaishi']" type="text" @click.stop="searchDiv16">采购部采购<br>{{ `${data2[0].采购部采购}%` }}</el-button>
             </el-tooltip>
           </div>
         </div>
@@ -163,6 +157,7 @@
           height="340"
           style="width: 100%;min-height: 300px;"
           size="mini"
+          stripe
           highlight-current-row
           border
           @row-click="handleSelect">
@@ -336,6 +331,7 @@
                 height="340"
                 style="width: 100%;min-height: 300px;"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -402,6 +398,7 @@
                 :data="tableDataDiv3"
                 height="340"
                 style="width: 100%;min-height: 300px;"
+                stripe
                 size="mini"
                 highlight-current-row
                 border
@@ -479,6 +476,7 @@
                 height="340"
                 style="width: 100%;min-height: 300px;"
                 size="mini"
+                stripe
                 highlight-current-row
                 border
                 @row-click="turnIniPro">
@@ -543,6 +541,7 @@
                 height="340"
                 style="width: 100%;min-height: 300px;"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -611,6 +610,7 @@
                 height="340"
                 style="width: 100%;min-height: 300px;"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -652,7 +652,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="实际总工时">
                   <template slot-scope="scope">
-                    {{ scope.row.结束时间 ? parseInt(scope.row.实际工时) + parseInt(scope.row.修补工时) : '--' }}
+                    {{ scope.row.实际工时 ? parseInt(scope.row.实际工时) + parseInt(scope.row.修补工时) : '--' }}
                   </template>
                 </el-table-column>
               </el-table>
@@ -679,6 +679,7 @@
                 height="340"
                 style="width: 100%;min-height: 300px;"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -747,6 +748,7 @@
                 height="340"
                 style="width: 100%;min-height: 300px;"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -803,12 +805,15 @@
         <el-row>
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
+              <h3>加工完成</h3>
               <el-table
                 id="div1"
                 ref="div1"
                 :data="tableDataDiv9A"
                 style="width: 100%;height: 340px;overflow-y: auto;"
                 size="mini"
+                stripe
+                height="340px"
                 highlight-current-row
                 border
                 @mouseenter.native="changeScroll1">
@@ -817,27 +822,27 @@
                   align="center"
                   type="index"
                   width="50"/>
-                <el-table-column align="center" label="组号" width="80px">
+                <el-table-column align="center" label="组号" width="55px">
                   <template slot-scope="scope">
                     {{ scope.row.组号 ? scope.row.组号 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="组件名称">
+                <el-table-column align="center" label="组件名称" min-width="95px">
                   <template slot-scope="scope">
                     {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="投产数量" width="80px">
+                <el-table-column align="center" label="投产数量" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.投产数量 ? scope.row.投产数量 : '0' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="加工完成数量">
+                <el-table-column align="center" label="加工完成数量" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.入库数量 ? scope.row.入库数量 : 0 }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="完成时间" width="100px">
+                <el-table-column align="center" label="完成时间" min-width="70px">
                   <template slot-scope="scope">
                     {{ scope.row.完成时间 ? scope.row.完成时间.substring(0, 11) : 0 }}
                   </template>
@@ -847,12 +852,15 @@
           </el-col>
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
+              <h3>采购到货</h3>
               <el-table
                 id="div2"
                 ref="div2"
                 :data="tableDataDiv9B"
                 style="width: 100%;height: 340px;overflow-y: scroll;"
                 size="mini"
+                stripe
+                height="340px"
                 highlight-current-row
                 border
                 @mouseenter.native="changeScroll2">
@@ -861,27 +869,27 @@
                   align="center"
                   type="index"
                   width="50"/>
-                <el-table-column align="center" label="组号" width="80px">
+                <el-table-column align="center" label="组号" width="55px">
                   <template slot-scope="scope">
                     {{ scope.row.组号 ? scope.row.组号 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="组件名称">
+                <el-table-column align="center" label="组件名称" min-width="95px">
                   <template slot-scope="scope">
                     {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="投产数量" width="80px">
+                <el-table-column align="center" label="投产数量" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.总零件数量 ? scope.row.总零件数量 : '0' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="采购到货数量">
+                <el-table-column align="center" label="采购到货数量" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.总到货数量 ? scope.row.总到货数量 : 0 }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="完成时间" width="100px">
+                <el-table-column align="center" label="完成时间" min-width="70px">
                   <template slot-scope="scope">
                     {{ scope.row.完成时间 !== '1900-01-01 00:00:00' ? scope.row.完成时间 : '未完成' }}
                   </template>
@@ -891,12 +899,15 @@
           </el-col>
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
+              <h3>车间采购</h3>
               <el-table
                 id="div3"
                 ref="div3"
                 :data="tableDataDiv9C"
                 style="width: 100%;height: 340px;overflow-y: scroll;"
+                stripe
                 size="mini"
+                height="340px"
                 highlight-current-row
                 border
                 @mouseenter.native="changeScroll3">
@@ -905,27 +916,27 @@
                   align="center"
                   type="index"
                   width="50"/>
-                <el-table-column align="center" label="组号" width="80px">
+                <el-table-column align="center" label="组号" width="55px">
                   <template slot-scope="scope">
                     {{ scope.row.组号 ? scope.row.组号 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="组件名称">
+                <el-table-column align="center" label="组件名称" min-width="95px">
                   <template slot-scope="scope">
                     {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="投产数量" width="80px">
+                <el-table-column align="center" label="投产数量" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.总零件数量 ? scope.row.总零件数量 : '0' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="车间采购到货">
+                <el-table-column align="center" label="车间采购到货" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.到货数量 ? scope.row.到货数量 : 0 }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="完成时间">
+                <el-table-column align="center" label="完成时间" min-width="70px">
                   <template slot-scope="scope">
                     {{ scope.row.完成时间 !== '1900-01-01 00:00:00' ? scope.row.完成时间 : '未完成' }}
                   </template>
@@ -952,6 +963,7 @@
                 height="340"
                 style="width: 100%"
                 size="mini"
+                stripe
                 highlight-current-row
                 border
                 @row-click="turnToProStatus">
@@ -1018,6 +1030,7 @@
                 height="340"
                 style="width: 100%"
                 size="mini"
+                stripe
                 highlight-current-row
                 border
                 @row-click="turnMaterArrMan">
@@ -1069,6 +1082,7 @@
                 height="340"
                 style="width: 100%"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -1128,6 +1142,7 @@
                 height="340"
                 style="width: 100%"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -1182,6 +1197,7 @@
                 height="340"
                 style="width: 100%"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -1241,6 +1257,7 @@
                 height="340"
                 style="width: 100%"
                 size="mini"
+                stripe
                 highlight-current-row
                 border
                 @row-click="turnToPCB">
@@ -1290,6 +1307,7 @@
             height="340"
             style="width: 100%"
             size="mini"
+            stripe
             highlight-current-row
             border>
             <el-table-column
@@ -1357,38 +1375,41 @@
         <el-row>
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
+              <h3>外购件</h3>
               <el-table
                 :data="tableDataDiv16A"
                 style="width: 100%;height: 340px;overflow-y: auto;"
                 size="mini"
+                stripe
+                height="340px"
                 highlight-current-row
                 border>
-                <el-table-column align="center" label="组号" width="80px">
+                <el-table-column align="center" label="组号" width="55px">
                   <template slot-scope="scope">
                     {{ scope.row.组号 ? scope.row.组号 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="组件名称">
+                <el-table-column align="center" label="组件名称" min-width="95px">
                   <template slot-scope="scope">
                     {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="总外购件数" width="80px">
+                <el-table-column align="center" label="总数" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.总外购件数 ? scope.row.总外购件数 : '0' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="已采购外购件数" width="100px">
+                <el-table-column align="center" label="已采购数" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.已采购外购件数 ? scope.row.已采购外购件数 : 0 }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="部分采购外购件数" width="100px">
+                <el-table-column align="center" label="部分采购数" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.部分采购外购件数 ? scope.row.部分采购外购件数 : 0 }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="总到货数外购件数" width="100px">
+                <el-table-column align="center" label="总到货数数" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.总到货数外购件数 ? scope.row.总到货数外购件数 : 0 }}
                   </template>
@@ -1398,38 +1419,41 @@
           </el-col>
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
+              <h3>标准件</h3>
               <el-table
                 :data="tableDataDiv16B"
                 style="width: 100%;height: 340px;overflow-y: scroll;"
                 size="mini"
+                stripe
+                height="340px"
                 highlight-current-row
                 border>
-                <el-table-column align="center" label="组号" width="80px">
+                <el-table-column align="center" label="组号" width="55px">
                   <template slot-scope="scope">
                     {{ scope.row.组号 ? scope.row.组号 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="组件名称">
+                <el-table-column align="center" label="组件名称" min-width="95px">
                   <template slot-scope="scope">
                     {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="总标准件数" width="80px">
+                <el-table-column align="center" label="总数" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.总标准件数 ? scope.row.总标准件数: '0' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="已采购标准件数">
+                <el-table-column align="center" label="已采购数" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.已采购标准件数 ? scope.row.已采购标准件数 : 0 }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="部分采购标准件数">
+                <el-table-column align="center" label="部分采购数" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.部分采购标准件数 ? scope.row.部分采购标准件数 : 0 }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="总到货数标准件数">
+                <el-table-column align="center" label="总到货数" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.总到货数标准件数 ? scope.row.总到货数标准件数 : 0 }}
                   </template>
@@ -1439,38 +1463,41 @@
           </el-col>
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
+              <h3>基本件</h3>
               <el-table
                 :data="tableDataDiv16C"
                 style="width: 100%;height: 340px;overflow-y: scroll;"
+                height="340px"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
-                <el-table-column align="center" label="组号" width="80px">
+                <el-table-column align="center" label="组号" width="55px">
                   <template slot-scope="scope">
                     {{ scope.row.组号 ? scope.row.组号 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="组件名称">
+                <el-table-column align="center" label="组件名称" min-width="95px">
                   <template slot-scope="scope">
                     {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="总基本件数" width="80px">
+                <el-table-column align="center" label="总数" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.总基本件数 ? scope.row.总基本件数: '0' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="已采购基本件数">
+                <el-table-column align="center" label="已采购数" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.已采购基本件数 ? scope.row.已采购基本件数 : 0 }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="部分采购基本件数">
+                <el-table-column align="center" label="部分采购数" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.部分采购基本件数 ? scope.row.部分采购基本件数 : 0 }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="总到货数基本件数">
+                <el-table-column align="center" label="总到货数" width="60px">
                   <template slot-scope="scope">
                     {{ scope.row.总到货数基本件数 ? scope.row.总到货数基本件数 : 0 }}
                   </template>
@@ -1489,15 +1516,17 @@
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-table
                 :data="tableDataDiv17A"
-                style="width: 100%;height: 340px;overflow-y: auto;"
+                style="width: 100%;overflow-y: auto;"
+                height="340px"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
                   label="序号"
                   align="center"
                   type="index"
-                  width="60"/>
+                  width="55"/>
                 <el-table-column align="center" label="组号" width="120px">
                   <template slot-scope="scope">
                     {{ scope.row.组号 ? scope.row.组号 : '--' }}
@@ -1508,17 +1537,17 @@
                     {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="总基本件数" width="150px">
+                <el-table-column align="center" label="总基本件数" width="120px">
                   <template slot-scope="scope">
                     {{ scope.row.总基本件数 ? scope.row.总基本件数 : '0' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="已采购基本件数" width="150px">
+                <el-table-column align="center" label="已采购基本件数" width="120px">
                   <template slot-scope="scope">
                     {{ scope.row.已采购基本件数? scope.row.已采购基本件数 : 0 }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="总到货数基本件数" width="150px">
+                <el-table-column align="center" label="总到货数基本件数" width="120px">
                   <template slot-scope="scope">
                     {{ scope.row.总到货数基本件数 ? scope.row.总到货数基本件数 : 0 }}
                   </template>
@@ -1530,15 +1559,17 @@
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-table
                 :data="tableDataDiv17B"
-                style="width: 100%;height: 340px;overflow-y: scroll;"
+                style="width: 100%;overflow-y: scroll;"
+                height="340px"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
                   label="序号"
                   align="center"
                   type="index"
-                  width="60"/>
+                  width="55"/>
                 <el-table-column align="center" label="组号" width="120px">
                   <template slot-scope="scope">
                     {{ scope.row.组号 ? scope.row.组号 : '--' }}
@@ -1549,17 +1580,17 @@
                     {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="总基本件数" width="150px">
+                <el-table-column align="center" label="总基本件数" width="120px">
                   <template slot-scope="scope">
                     {{ scope.row.总基本件数 ? scope.row.总基本件数: '0' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="已采购基本件数" width="150px">
+                <el-table-column align="center" label="已采购基本件数" width="120px">
                   <template slot-scope="scope">
                     {{ scope.row.已采购基本件数 ? scope.row.已采购基本件数 : 0 }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="总到货数基本件数" width="150px">
+                <el-table-column align="center" label="总到货数基本件数" width="120px">
                   <template slot-scope="scope">
                     {{ scope.row.总到货数基本件数 ? scope.row.总到货数基本件数 : 0 }}
                   </template>
@@ -1588,6 +1619,7 @@
                 height="340"
                 style="width: 100%;min-height: 300px;"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -1644,6 +1676,7 @@
                 height="340"
                 style="width: 100%"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -1698,6 +1731,7 @@
                 height="340"
                 style="width: 100%"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -1758,6 +1792,7 @@
                 height="340"
                 style="width: 100%"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -1765,38 +1800,38 @@
                   align="center"
                   type="index"
                   width="50"/>
-                <el-table-column align="center" label="是否完成">
+                <el-table-column align="center" label="是否完成" width="105">
                   <template slot-scope="scope">
                     <el-tag v-if="parseInt(scope.row.是否合格)=== 1" type="success" size="mini" style="width: 80px">合格</el-tag>
                     <el-tag v-else type="danger" size="mini" style="width: 80px">不合格</el-tag>
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="机床图号">
+                <el-table-column align="center" label="机床图号" width="110">
                   <template slot-scope="scope">
                     {{ scope.row.机床图号 ? scope.row.机床图号 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="机床名称">
+                <el-table-column align="center" label="机床名称" min-width="210">
                   <template slot-scope="scope">
                     {{ scope.row.机床名称 ? scope.row.机床名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="组号" width="80px">
+                <el-table-column align="center" label="组号" width="70px">
                   <template slot-scope="scope">
                     {{ scope.row.组号 ? scope.row.组号 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="组件名称">
+                <el-table-column align="center" label="组件名称" width="110">
                   <template slot-scope="scope">
                     {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="检测项">
+                <el-table-column align="center" label="检测项" width="110">
                   <template slot-scope="scope">
                     {{ scope.row.检测项 ? scope.row.检测项 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="检测项明细">
+                <el-table-column align="center" label="检测项明细" min-width="310">
                   <template slot-scope="scope">
                     {{ scope.row.检测项明细 ? scope.row.检测项明细 : '--' }}
                   </template>
@@ -1828,6 +1863,7 @@
                 height="340"
                 style="width: 100%"
                 size="mini"
+                stripe
                 highlight-current-row
                 border>
                 <el-table-column
@@ -1835,12 +1871,6 @@
                   align="center"
                   type="index"
                   width="50"/>
-                <el-table-column align="center" label="是否完成">
-                  <template slot-scope="scope">
-                    <el-tag v-if="parseInt(scope.row.是否合格)=== 1" type="success" size="mini" style="width: 80px">合格</el-tag>
-                    <el-tag v-else type="danger" size="mini" style="width: 80px">不合格</el-tag>
-                  </template>
-                </el-table-column>
                 <el-table-column align="center" label="机床图号">
                   <template slot-scope="scope">
                     {{ scope.row.机床图号 ? scope.row.机床图号 : '--' }}
@@ -1851,29 +1881,24 @@
                     {{ scope.row.机床名称 ? scope.row.机床名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="组号" width="80px">
+                <el-table-column align="center" label="总装开始时间" width="150px">
                   <template slot-scope="scope">
-                    {{ scope.row.组号 ? scope.row.组号 : '--' }}
+                    {{ scope.row.机床装配实际开始时间 ? scope.row.机床装配实际开始时间 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="组件名称">
+                <el-table-column align="center" label="总装完成时间">
                   <template slot-scope="scope">
-                    {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
+                    {{ scope.row.机床装配实际完成时间 ? scope.row.机床装配实际完成时间 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="检测项">
+                <el-table-column align="center" label="调试开始时间">
                   <template slot-scope="scope">
-                    {{ scope.row.检测项 ? scope.row.检测项 : '--' }}
+                    {{ scope.row.调试开始时间 ? scope.row.调试开始时间 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="检测项明细">
+                <el-table-column align="center" label="调试完成时间">
                   <template slot-scope="scope">
-                    {{ scope.row.检测项明细 ? scope.row.检测项明细 : '--' }}
-                  </template>
-                </el-table-column>
-                <el-table-column align="center" label="备注">
-                  <template slot-scope="scope">
-                    {{ scope.row.备注 ? scope.row.备注 : '--' }}
+                    {{ scope.row.调试结束时间 ? scope.row.调试结束时间 : '--' }}
                   </template>
                 </el-table-column>
               </el-table>
@@ -1886,7 +1911,7 @@
 </template>
 
 <script>
-import { SelectMachine, ProcessOutsourcing, ProcessProportion, searchMachine } from '@/api/ManufacturingCenter/ParseQuery'
+import { SelectMachine, ProcessOutsourcing, ProcessProportion, searchMachine, searchAll } from '@/api/ManufacturingCenter/ParseQuery'
 import request from '@/utils/request'
 import echarts from 'echarts'
 import Cookie from 'js-cookie'
@@ -2002,6 +2027,30 @@ export default {
         总装调试百分比: 0,
         发货百分比: 0
       }],
+      data2: [{
+        签订合同: 0,
+        产品设计: 0,
+        零件分配: 0,
+        自制件: 0,
+        车间采购: 0,
+        采购部采购: 0,
+        自家备料: 0,
+        外购备料: 0,
+        工艺定额: 0,
+        能力平衡: 0,
+        外协: 0,
+        车间加工: 0,
+        自制质检: 0,
+        采购质检: 0,
+        成组配套: 0,
+        电气装配: 0,
+        机械装配: 0,
+        冷作: 0,
+        油漆: 0,
+        装配质检: 0,
+        总装调试: 0,
+        发货: 0
+      }],
       isActive: false,
       dataDiv2: {
         组件总数: '',
@@ -2203,29 +2252,26 @@ export default {
       this.showDiv21 = false
       this.showDiv22 = false
       this.isActive = false
-      this.data[0].签订合同百分比 = 0
-      this.data[0].产品设计百分比 = 0
-      this.data[0].零件分配百分比 = 0
-      this.data[0].自制件百分比 = 0
-      this.data[0].车间采购百分比 = 0
-      this.data[0].采购部采购百分比 = 0
-      this.data[0].自家备料百分比 = 0
-      this.data[0].外购备料百分比 = 0
-      this.data[0].工艺百分比 = 0
-      this.data[0].定额百分比 = 0
-      this.data[0].能力平衡百分比 = 0
-      this.data[0].工序外协百分比 = 0
-      this.data[0].车间加工百分比 = 0
-      this.data[0].自制质检百分比 = 0
-      this.data[0].采购质检百分比 = 0
-      this.data[0].成组配套百分比 = 0
-      this.data[0].电气装配百分比 = 0
-      this.data[0].机械装配百分比 = 0
-      this.data[0].冷作百分比 = 0
-      this.data[0].油漆百分比 = 0
-      this.data[0].装配质检百分比 = 0
-      this.data[0].总装调试百分比 = 0
-      this.data[0].发货百分比 = 0
+      this.data2[0].签订合同 = 0
+      this.data2[0].产品设计 = 0
+      this.data2[0].零件分配 = 0
+      this.data2[0].自制件 = 0
+      this.data2[0].车间采购 = 0
+      this.data2[0].采购部采购 = 0
+      this.data2[0].自家备料 = 0
+      this.data2[0].外购备料 = 0
+      this.data2[0].工艺定额 = 0
+      this.data2[0].能力平衡 = 0
+      this.data2[0].外协 = 0
+      this.data2[0].车间加工 = 0
+      this.data2[0].自制质检 = 0
+      this.data2[0].采购质检 = 0
+      this.data2[0].成组配套 = 0
+      this.data2[0].电气装配 = 0
+      this.data2[0].机械装配 = 0
+      this.data2[0].冷作 = 0
+      this.data2[0].油漆 = 0
+      this.data2[0].装配质检 = 0
       this.machineValue ? this.check = 1 : this.check = 0
       searchMachine(this.check, this.machineValue).then(response => {
         this.tableDataDiv0 = response.data
@@ -2301,40 +2347,31 @@ export default {
       this.showDiv19 = false
       this.showDiv20 = false
       this.showDiv0 = true
-      await request({
-        url: '',
-        method: 'post',
-        data: {
-          type: '3',
-          name: `select * from 综合查询_状态 where 机床流水号 = ${this.machineValue1}`
-        }
-      }).then(res => {
+      await searchAll(this.machineValue1).then(response => {
         this.isActive = true
-        this.data = res.data
-        console.log(res)
-        if (res.data[0].签订合同状态 === 1) { this.color[0] = 'weikaishi' } else if (res.data[0].签订合同状态 === 2) { this.color[0] = 'jixingzhong' } else if (res.data[0].签订合同状态 === 3) { this.color[0] = 'yiwancheng' } else if (res.data[0].签订合同状态 === 4) { this.color[0] = 'red' }
-        if (res.data[0].产品设计状态 === 1) { this.color[1] = 'weikaishi' } else if (res.data[0].产品设计状态 === 2) { this.color[1] = 'jixingzhong' } else if (res.data[0].产品设计状态 === 3) { this.color[1] = 'yiwancheng' } else if (res.data[0].产品设计状态 === 4) { this.color[1] = 'red' }
-        if (res.data[0].零件分配状态 === 1) { this.color[2] = 'weikaishi' } else if (res.data[0].零件分配状态 === 2) { this.color[2] = 'jixingzhong' } else if (res.data[0].零件分配状态 === 3) { this.color[2] = 'yiwancheng' } else if (res.data[0].零件分配状态 === 4) { this.color[2] = 'red' }
-        if (res.data[0].自制件状态 === 1) { this.color[3] = 'weikaishi' } else if (res.data[0].自制件状态 === 2) { this.color[3] = 'jixingzhong' } else if (res.data[0].自制件状态 === 3) { this.color[3] = 'yiwancheng' } else if (res.data[0].自制件状态 === 4) { this.color[3] = 'red' }
-        if (res.data[0].采购部采购状态 === 1) { this.color[4] = 'weikaishi' } else if (res.data[0].采购部采购状态 === 2) { this.color[4] = 'jixingzhong' } else if (res.data[0].采购部采购状态 === 3) { this.color[4] = 'yiwancheng' } else if (res.data[0].采购部采购状态 === 4) { this.color[4] = 'red' }
-        if (res.data[0].车间采购状态 === 1) { this.color[5] = 'weikaishi' } else if (res.data[0].车间采购状态 === 2) { this.color[5] = 'jixingzhong' } else if (res.data[0].车间采购状态 === 3) { this.color[5] = 'yiwancheng' } else if (res.data[0].车间采购状态 === 4) { this.color[5] = 'red' }
-        if (res.data[0].外购备料状态 === 1) { this.color[6] = 'weikaishi' } else if (res.data[0].外购备料状态 === 2) { this.color[6] = 'jixingzhong' } else if (res.data[0].外购备料状态 === 3) { this.color[6] = 'yiwancheng' } else if (res.data[0].外购备料状态 === 4) { this.color[6] = 'red' }
-        if (res.data[0].自家备料状态 === 1) { this.color[7] = 'weikaishi' } else if (res.data[0].自家备料状态 === 2) { this.color[7] = 'jixingzhong' } else if (res.data[0].自家备料状态 === 3) { this.color[7] = 'yiwancheng' } else if (res.data[0].自家备料状态 === 4) { this.color[7] = 'red' }
-        if (res.data[0].工艺状态 === 1) { this.color[8] = 'weikaishi' } else if (res.data[0].工艺状态 === 2) { this.color[8] = 'jixingzhong' } else if (res.data[0].工艺状态 === 3) { this.color[8] = 'yiwancheng' } else if (res.data[0].工艺状态 === 4) { this.color[8] = 'red' }
-        if (res.data[0].定额状态 === 1) { this.color[9] = 'weikaishi' } else if (res.data[0].定额状态 === 2) { this.color[9] = 'jixingzhong' } else if (res.data[0].定额状态 === 3) { this.color[9] = 'yiwancheng' } else if (res.data[0].定额状态 === 4) { this.color[9] = 'red' }
-        if (res.data[0].能力平衡状态 === 1) { this.color[10] = 'weikaishi' } else if (res.data[0].能力平衡状态 === 2) { this.color[10] = 'jixingzhong' } else if (res.data[0].能力平衡状态 === 3) { this.color[10] = 'yiwancheng' } else if (res.data[0].能力平衡状态 === 4) { this.color[10] = 'red' }
-        if (res.data[0].工序外协状态 === 1) { this.color[11] = 'weikaishi' } else if (res.data[0].工序外协状态 === 2) { this.color[11] = 'jixingzhong' } else if (res.data[0].工序外协状态 === 3) { this.color[11] = 'yiwancheng' } else if (res.data[0].工序外协状态 === 4) { this.color[11] = 'red' }
-        if (res.data[0].车间加工状态 === 1) { this.color[12] = 'weikaishi' } else if (res.data[0].车间加工状态 === 2) { this.color[12] = 'jixingzhong' } else if (res.data[0].车间加工状态 === 3) { this.color[12] = 'yiwancheng' } else if (res.data[0].车间加工状态 === 4) { this.color[12] = 'red' }
-        if (res.data[0].采购质检状态 === 1) { this.color[13] = 'weikaishi' } else if (res.data[0].采购质检状态 === 2) { this.color[13] = 'jixingzhong' } else if (res.data[0].采购质检状态 === 3) { this.color[13] = 'yiwancheng' } else if (res.data[0].采购质检状态 === 4) { this.color[13] = 'red' }
-        if (res.data[0].自制质检状态 === 1) { this.color[14] = 'weikaishi' } else if (res.data[0].自制质检状态 === 2) { this.color[14] = 'jixingzhong' } else if (res.data[0].自制质检状态 === 3) { this.color[14] = 'yiwancheng' } else if (res.data[0].自制质检状态 === 4) { this.color[14] = 'red' }
-        if (res.data[0].成组配套状态 === 1) { this.color[15] = 'weikaishi' } else if (res.data[0].成组配套状态 === 2) { this.color[15] = 'jixingzhong' } else if (res.data[0].成组配套状态 === 3) { this.color[15] = 'yiwancheng' } else if (res.data[0].成组配套状态 === 4) { this.color[15] = 'red' }
-        if (res.data[0].油漆状态 === 1) { this.color[16] = 'weikaishi' } else if (res.data[0].油漆状态 === 2) { this.color[16] = 'jixingzhong' } else if (res.data[0].油漆状态 === 3) { this.color[16] = 'yiwancheng' } else if (res.data[0].油漆状态 === 4) { this.color[16] = 'red' }
-        if (res.data[0].冷作状态 === 1) { this.color[17] = 'weikaishi' } else if (res.data[0].冷作状态 === 2) { this.color[17] = 'jixingzhong' } else if (res.data[0].冷作状态 === 3) { this.color[17] = 'yiwancheng' } else if (res.data[0].冷作状态 === 4) { this.color[17] = 'red' }
-        if (res.data[0].机械装配状态 === 1) { this.color[18] = 'weikaishi' } else if (res.data[0].机械装配状态 === 2) { this.color[18] = 'jixingzhong' } else if (res.data[0].机械装配状态 === 3) { this.color[18] = 'yiwancheng' } else if (res.data[0].机械装配状态 === 4) { this.color[18] = 'red' }
-        if (res.data[0].电气装配状态 === 1) { this.color[19] = 'weikaishi' } else if (res.data[0].电气装配状态 === 2) { this.color[19] = 'jixingzhong' } else if (res.data[0].电气装配状态 === 3) { this.color[19] = 'yiwancheng' } else if (res.data[0].电气装配状态 === 4) { this.color[19] = 'red' }
-        if (res.data[0].装配质检状态 === 1) { this.color[20] = 'weikaishi' } else if (res.data[0].装配质检状态 === 2) { this.color[20] = 'jixingzhong' } else if (res.data[0].装配质检状态 === 3) { this.color[20] = 'yiwancheng' } else if (res.data[0].装配质检状态 === 4) { this.color[20] = 'red' }
-        if (res.data[0].总装调试状态 === 1) { this.color[21] = 'weikaishi' } else if (res.data[0].总装调试状态 === 2) { this.color[21] = 'jixingzhong' } else if (res.data[0].总装调试状态 === 3) { this.color[21] = 'yiwancheng' } else if (res.data[0].总装调试状态 === 4) { this.color[21] = 'red' }
-        if (res.data[0].发货状态 === 1) { this.color[22] = 'weikaishi' } else if (res.data[0].发货状态 === 2) { this.color[22] = 'jixingzhong' } else if (res.data[0].发货状态 === 3) { this.color[22] = 'yiwancheng' } else if (res.data[0].发货状态 === 4) { this.color[22] = 'red' }
+        this.data2 = response.data
+        if (response.data[0].签订合同 === 0) { this.color[0] = 'weikaishi' } else if (response.data[0].签订合同 !== 0 && response.data[0].签订合同 !== 100) { this.color[0] = 'jixingzhong' } else if (response.data[0].签订合同 === 100) { this.color[0] = 'yiwancheng' }
+        if (response.data[0].产品设计 === 0) { this.color[1] = 'weikaishi' } else if (response.data[0].产品设计 !== 0 && response.data[0].产品设计 !== 100) { this.color[1] = 'jixingzhong' } else if (response.data[0].产品设计 === 100) { this.color[1] = 'yiwancheng' }
+        if (response.data[0].零件分配 === 0) { this.color[2] = 'weikaishi' } else if (response.data[0].零件分配 !== 0 && response.data[0].零件分配 !== 100) { this.color[2] = 'jixingzhong' } else if (response.data[0].零件分配 === 100) { this.color[2] = 'yiwancheng' }
+        if (response.data[0].自制件 === 0) { this.color[3] = 'weikaishi' } else if (response.data[0].自制件 !== 0 && response.data[0].自制件 !== 100) { this.color[3] = 'jixingzhong' } else if (response.data[0].自制件 === 100) { this.color[3] = 'yiwancheng' }
+        if (response.data[0].采购部采购 === 0) { this.color[4] = 'weikaishi' } else if (response.data[0].采购部采购 !== 0 && response.data[0].采购部采购 !== 100) { this.color[4] = 'jixingzhong' } else if (response.data[0].采购部采购 === 100) { this.color[4] = 'yiwancheng' }
+        if (response.data[0].车间采购 === 0) { this.color[5] = 'weikaishi' } else if (response.data[0].车间采购 !== 0 && response.data[0].车间采购 !== 100) { this.color[5] = 'jixingzhong' } else if (response.data[0].车间采购 === 100) { this.color[5] = 'yiwancheng' }
+        if (response.data[0].外购备料 === 0) { this.color[6] = 'weikaishi' } else if (response.data[0].外购备料 !== 0 && response.data[0].外购备料 !== 100) { this.color[6] = 'jixingzhong' } else if (response.data[0].外购备料 === 100) { this.color[6] = 'yiwancheng' }
+        if (response.data[0].自家备料 === 0) { this.color[7] = 'weikaishi' } else if (response.data[0].自家备料 !== 0 && response.data[0].自家备料 !== 100) { this.color[7] = 'jixingzhong' } else if (response.data[0].自家备料 === 100) { this.color[7] = 'yiwancheng' }
+        if (response.data[0].工艺定额 === 0) { this.color[8] = 'weikaishi' } else if (response.data[0].工艺定额 !== 0 && response.data[0].工艺定额 !== 100) { this.color[8] = 'jixingzhong' } else if (response.data[0].工艺定额 === 100) { this.color[8] = 'yiwancheng' }
+        if (response.data[0].能力平衡 === 0) { this.color[10] = 'weikaishi' } else if (response.data[0].能力平衡 !== 0 && response.data[0].能力平衡 !== 100) { this.color[10] = 'jixingzhong' } else if (response.data[0].能力平衡 === 100) { this.color[10] = 'yiwancheng' }
+        if (response.data[0].外协 === 0) { this.color[11] = 'weikaishi' } else if (response.data[0].外协 !== 0 && response.data[0].外协 !== 100) { this.color[11] = 'jixingzhong' } else if (response.data[0].外协 === 100) { this.color[11] = 'yiwancheng' }
+        if (response.data[0].车间加工 === 0) { this.color[12] = 'weikaishi' } else if (response.data[0].车间加工 !== 0 && response.data[0].车间加工 !== 100) { this.color[12] = 'jixingzhong' } else if (response.data[0].车间加工 === 100) { this.color[12] = 'yiwancheng' }
+        if (response.data[0].采购质检 === 0) { this.color[13] = 'weikaishi' } else if (response.data[0].采购质检 !== 0 && response.data[0].采购质检 !== 100) { this.color[13] = 'jixingzhong' } else if (response.data[0].采购质检 === 100) { this.color[13] = 'yiwancheng' }
+        if (response.data[0].自制质检 === 0) { this.color[14] = 'weikaishi' } else if (response.data[0].自制质检 !== 0 && response.data[0].自制质检 !== 100) { this.color[14] = 'jixingzhong' } else if (response.data[0].自制质检 === 100) { this.color[14] = 'yiwancheng' }
+        if (response.data[0].成组配套 === 0) { this.color[15] = 'weikaishi' } else if (response.data[0].成组配套 !== 0 && response.data[0].成组配套 !== 100) { this.color[15] = 'jixingzhong' } else if (response.data[0].成组配套 === 100) { this.color[15] = 'yiwancheng' }
+        if (response.data[0].油漆 === 0) { this.color[16] = 'weikaishi' } else if (response.data[0].油漆 !== 0 && response.data[0].油漆 !== 100) { this.color[16] = 'jixingzhong' } else if (response.data[0].油漆 === 100) { this.color[16] = 'yiwancheng' }
+        if (response.data[0].冷作 === 0) { this.color[17] = 'weikaishi' } else if (response.data[0].冷作 !== 0 && response.data[0].冷作 !== 100) { this.color[17] = 'jixingzhong' } else if (response.data[0].冷作 === 100) { this.color[17] = 'yiwancheng' }
+        if (response.data[0].机械装配 === 0) { this.color[18] = 'weikaishi' } else if (response.data[0].机械装配 !== 0 && response.data[0].机械装配 !== 100) { this.color[18] = 'jixingzhong' } else if (response.data[0].机械装配 === 100) { this.color[18] = 'yiwancheng' }
+        if (response.data[0].电气装配 === 0) { this.color[19] = 'weikaishi' } else if (response.data[0].电气装配 !== 0 && response.data[0].电气装配 !== 100) { this.color[19] = 'jixingzhong' } else if (response.data[0].电气装配 === 100) { this.color[19] = 'yiwancheng' }
+        if (response.data[0].装配质检 === 0) { this.color[20] = 'weikaishi' } else if (response.data[0].装配质检 !== 0 && response.data[0].装配质检 !== 100) { this.color[20] = 'jixingzhong' } else if (response.data[0].装配质检 === 100) { this.color[20] = 'yiwancheng' }
+        if (response.data[0].总装调试 === 0) { this.color[21] = 'weikaishi' } else if (response.data[0].总装调试 !== 0 && response.data[0].总装调试 !== 100) { this.color[21] = 'jixingzhong' } else if (response.data[0].总装调试 === 100) { this.color[21] = 'yiwancheng' }
+        if (response.data[0].发货 === 0) { this.color[22] = 'weikaishi' } else if (response.data[0].发货 !== 0 && response.data[0].发货 !== 100) { this.color[22] = 'jixingzhong' } else if (response.data[0].发货 === 100) { this.color[22] = 'yiwancheng' }
       })
     },
     // 查询签订合同div数据
@@ -4024,8 +4061,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: `SELECT *
-  FROM [质检管理_装配质检_查询视图] where 机床流水号 = ${this.machineValue1} and 组件流水号 is  null`
+          name: `select 机床图号,机床名称,机床装配实际开始时间,机床装配实际完成时间,调试开始时间,调试结束时间 from PDM_机床名称 where  机床流水号 = ${this.machineValue1}`
         }
       }).then(res => {
         this.tableDataDiv22 = res.data
@@ -4470,7 +4506,7 @@ export default {
     width: 1858px;
     height: 400px;
     /*border: 1px solid red;*/
-    background: url('../../../assets/img/img13.png') repeat;
+    background: url('../../../assets/img/img15.png') repeat;
     background-repeat:no-repeat;
     background-size:100% 100%;-moz-background-size:100% 100%;
   }
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index b22e0eaa..72867631 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -190,13 +190,13 @@
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
         placeholder="选择日期"/>
-      <el-tooltip effect="dark" content="将零件选择到采购单" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
         <el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="purchaseRequisition()">制造部采购</el-button>
       </el-tooltip>
-      <el-tooltip effect="dark" content="所选零件分配到采购部" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
         <el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
       </el-tooltip>
-      <el-tooltip effect="dark" content="所选零件分配为自家生产" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
         <el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
       </el-tooltip>
     </el-card>
@@ -292,12 +292,12 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="150px" fixed="right">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="编辑" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block;margin-right: 10px">
                 <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
               </div>
             </el-tooltip>
-            <el-tooltip effect="dark" content="移出" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="移出" placement="top">
               <div style="display: inline-block">
                 <el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
               </div>
@@ -365,12 +365,12 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="编辑" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block;margin-right: 10px">
                 <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
               </div>
             </el-tooltip>
-            <el-tooltip effect="dark" content="移出" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="移出" placement="top">
               <div style="display: inline-block">
                 <el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
               </div>
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/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index 778a6f26..bd86ff96 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -82,7 +82,7 @@
         <el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" >
           <el-table-column label="[1]" align="center" width="120px">
             <template slot-scope="scope">
-              <el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
+              <el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
                 <div :class="colorCode[scope.$index][0]" @click="handleChange1(scope.$index, scope.row, 'form', 0)">
                   <h4>{{ process[scope.$index][0] }}</h4><h4>{{ planDate[scope.$index][0] }} </h4><h4> {{ realDate[scope.$index][0] }}</h4><h4> {{ worker[scope.$index][0] }}</h4>
                 </div>
@@ -91,7 +91,7 @@
           </el-table-column>
           <el-table-column label="[2]" align="center" width="120px">
             <template slot-scope="scope">
-              <el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
+              <el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
                 <div :class="colorCode[scope.$index][1]" @click="handleChange1(scope.$index, scope.row, 'form', 1)">
                   <h4>{{ process[scope.$index][1] }}</h4><h4>{{ planDate[scope.$index][1] }} </h4><h4> {{ realDate[scope.$index][1] }}</h4><h4> {{ worker[scope.$index][1] }}</h4>
                 </div>
@@ -100,7 +100,7 @@
           </el-table-column>
           <el-table-column label="[3]" align="center" width="120px">
             <template slot-scope="scope">
-              <el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
+              <el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
                 <div :class="colorCode[scope.$index][2]" @click="handleChange1(scope.$index, scope.row, 'form', 2)">
                   <h4>{{ process[scope.$index][2] }}</h4><h4>{{ planDate[scope.$index][2] }} </h4><h4> {{ realDate[scope.$index][2] }}</h4><h4> {{ worker[scope.$index][2] }}</h4>
                 </div>
@@ -109,7 +109,7 @@
           </el-table-column>
           <el-table-column label="[4]" align="center" width="120px">
             <template slot-scope="scope">
-              <el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
+              <el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
                 <div :class="colorCode[scope.$index][3]" @click="handleChange1(scope.$index, scope.row, 'form', 3)">
                   <h4>{{ process[scope.$index][3] }}</h4><h4>{{ planDate[scope.$index][3] }} </h4><h4> {{ realDate[scope.$index][3] }}</h4><h4> {{ worker[scope.$index][3] }}</h4>
                 </div>
@@ -118,7 +118,7 @@
           </el-table-column>
           <el-table-column label="[5]" align="center" width="120px">
             <template slot-scope="scope">
-              <el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
+              <el-tooltip :open-delay="1200" effect="dark" content="单击工序修改进度" placement="top">
                 <div :class="colorCode[scope.$index][4]" @click="handleChange1(scope.$index, scope.row, 'form', 4)">
                   <h4>{{ process[scope.$index][4] }}</h4><h4>{{ planDate[scope.$index][4] }} </h4><h4> {{ realDate[scope.$index][4] }}</h4><h4> {{ worker[scope.$index][4] }}</h4>
                 </div>
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index 5fde40f2..7cee2dd8 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -47,7 +47,7 @@
         value-format="yyyy-MM-dd"
         style="top: 1px;"
         placeholder="选择开始日期"/>
-      <el-tooltip effect="dark" content="变更零件加工开始和结束时间" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="变更零件加工开始和结束时间" placement="top">
         <el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">零件计划变更</el-button>
       </el-tooltip>
       <el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
@@ -142,7 +142,7 @@
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
-        <el-tooltip effect="dark" content="将选中零件自动排出加工工序" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="将选中零件自动排出加工工序" placement="top">
           <el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 50px 10px 10px" @click="Selection">选入</el-button>
         </el-tooltip>
         <el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 20px 10px 10px" @click="SelectionAll">全部选入</el-button>
@@ -431,11 +431,11 @@
             @size-change="handleSizeChange1"
             @current-change="handleCurrentChange1"/>
           <div style="float:right">
-            <el-tooltip effect="dark" content="自动计算工序加工时间" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="自动计算工序加工时间" placement="top">
               <el-button type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Discharge">虚拟排产</el-button>
             </el-tooltip>
             <el-button v-if="可以确定零件计划" type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Plan" >确定零件计划</el-button>
-            <el-tooltip effect="dark" content="选出重新设置零件的加工时间" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="选出重新设置零件的加工时间" placement="top">
               <el-button type="danger" size="small" icon="el-icon-upload2" style="float:right;margin:5px 50px 10px 10px" @click="allOut">全部选出</el-button>
             </el-tooltip>
           </div>
@@ -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/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index a5f25df9..6cf4fa72 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -87,7 +87,7 @@
         size="small"
         value-format="yyyy-MM-dd"
         placeholder="选择日期"/>
-      <el-tooltip effect="dark" content="设定设备参数有效时间" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
         <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
       </el-tooltip>
       <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
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/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index a2d89836..f43cab92 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -31,7 +31,7 @@
           type="date"
           placeholder="请选择结束日期"/>
         <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
-        <el-tooltip effect="dark" content="新增项目" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
           <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
         </el-tooltip>
       </div>
@@ -107,7 +107,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="350">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="增加机床" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="增加机床" placement="top">
               <el-button
                 size="mini"
                 type="warning"
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/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
index eb66e98b..7589ec6f 100644
--- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
+++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
@@ -43,7 +43,7 @@
         </el-select>
         <span>零件图号:</span>
         <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
-        <el-tooltip effect="dark" content="查询序间外协计划" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="查询序间外协计划" placement="top">
           <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize2=10; pageCurrent2=1;searchPartNum()">查询</el-button>
         </el-tooltip>
       </el-row>
@@ -151,7 +151,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-tooltip effect="dark" content="保存" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="保存" placement="top">
         <el-button size="small" type="primary" style="float:right;margin: 10px" @click="saveRowPrice">保存</el-button>
       </el-tooltip>
     </el-card>
diff --git a/src/views/Outsourcing/OutFactoryMaintenance/index.vue b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
index 74aa1bb4..f9a00bb6 100644
--- a/src/views/Outsourcing/OutFactoryMaintenance/index.vue
+++ b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
@@ -7,7 +7,7 @@
       <span>电话:</span>
       <el-input v-model="phNumber" size="small" clearable style="width:200px"/>
       <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
-      <el-tooltip effect="dark" content="新增外协厂家" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="新增外协厂家" placement="top">
         <el-button type="primary" class="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
       </el-tooltip>
     </el-card>
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 936c2c4d..22e9faf8 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -172,7 +172,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="280px" fixed="right">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="记录外协付款到票信息" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="记录外协付款到票信息" placement="top">
               <el-button
                 :disabled="scope.row.实际付款时间!==''"
                 size="mini"
@@ -181,7 +181,7 @@
                 class="el-icon-check"
                 @click="editType1(scope.row, 'form');param = 0">到票</el-button>
             </el-tooltip>
-            <el-tooltip effect="dark" content="记录外协扣款信息" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="记录外协扣款信息" placement="top">
               <el-button
                 :disabled="scope.row.实际付款时间!==''"
                 size="mini"
@@ -190,7 +190,7 @@
                 class="el-icon-edit"
                 @click="Withdrawing(scope.$index, scope.row, 'form2')">扣款</el-button>
             </el-tooltip>
-            <el-tooltip effect="dark" content="付款信息" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="付款信息" placement="top">
               <el-button
                 :disabled="scope.row.实际付款时间!==''||scope.row.单据状态!=='3'"
                 size="mini"
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 2845e58d..d9fc56f6 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -337,13 +337,13 @@
       <div>
         <span>下调金额:（百分比）</span>
         <el-input v-model="money" size="small" clearable style="width:200px"/>
-        <el-tooltip effect="dark" content="计算选入零件的价格" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="计算选入零件的价格" placement="top">
           <el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>
         </el-tooltip>
-        <el-tooltip effect="dark" content="核对价格信息后确定" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="核对价格信息后确定" placement="top">
           <el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="confirmPrice">确定价格</el-button>
         </el-tooltip>
-        <el-tooltip effect="dark" content="成交" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top">
           <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 15px" @click="Deal">成交</el-button>
         </el-tooltip>
         <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 15px" @click="exportTable('RWD')">导出外协加工任务单</el-button>
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index f4f896cd..ce98b5ba 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -13,7 +13,7 @@
         size="small"
         placeholder="选择日期"/>
       <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
-      <el-tooltip effect="dark" content="打印外协采购单" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="打印外协采购单" placement="top">
         <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportTable('RWD')">导出外协加工任务单</el-button>
       </el-tooltip>
     </el-card>
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/ArrivalEnquiry/index.vue b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
index 5d11108e..0ba900a8 100644
--- a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
+++ b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
@@ -26,6 +26,7 @@
         v-loading=""
         :data="tableData1"
         border
+        stripe
         highlight-current-row
         style="width: 100%;max-height: 250px;"
         height="250px"
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 925eb56f..3646c6c6 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -408,7 +408,7 @@
           size="small"
           style="margin-left: 10px"
           @click="createInquirySheet">创建询价单</el-button>
-        <el-tooltip effect="dark" content="为选择的询价单添加物料" placement="top" open-delay="1000">
+        <el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
           <el-button
             type="warning"
             size="small"
@@ -488,7 +488,7 @@
           @current-change="handleCurrentChange2"/>
         <el-button :disabled="tableData3.length===0" type="warning" size="mini" style="margin-left:10px;float: right" @click="printInquirySheet()">打印</el-button>
         <el-button :disabled="tableData3.length===0" type="warning" size="mini" style="margin-left:10px;float: right" @click="exportInquirySheet()">导出</el-button>
-        <el-tooltip effect="dark" content="保存该询价单" placement="top" open-delay="1000">
+        <el-tooltip :open-delay="1000" effect="dark" content="保存该询价单" placement="top">
           <el-button :disabled="tableData3.length===0" type="success" size="mini" style="float: right" @click="saveOrder()">保存</el-button>
         </el-tooltip>
       </div><hr>
@@ -551,7 +551,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100" fixed="right">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="将该物料从询价单中删除" placement="top" open-delay="1000">
+            <el-tooltip :open-delay="1000" effect="dark" content="将该物料从询价单中删除" placement="top">
               <el-button type="danger" size="mini" plain icon="el-icon-delete" @click="outInquirySheet(scope.row)">移出</el-button>
             </el-tooltip>
           </template>
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index e7690880..2a4dc026 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -162,7 +162,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-tooltip content="一键删除交货期" placement="right" open-delay="1000">
+      <el-tooltip :open-delay="1000" content="一键删除交货期" placement="right">
         <el-button type="danger" icon="el-icon-date" size="small" @click="deleteAllDate()"/>
       </el-tooltip>
       <span>①选择合同模板：</span>
@@ -176,7 +176,7 @@
       <!--<el-input v-model="actualTotal" size="small" style="width: 100px"/>-->
       <!--<el-button type="primary" size="small" @click="submitTotal()">确认</el-button>-->
       <span>②递交审批：</span>
-      <el-tooltip effect="dark" content="核对信息后生成合同" placement="top" open-delay="1000">
+      <el-tooltip :open-delay="1000" effect="dark" content="核对信息后生成合同" placement="top">
         <el-button type="success" size="small" @click="generateContract()">递交</el-button>
       </el-tooltip>
       <hr>
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/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 4b9ca454..e450c44b 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -19,7 +19,7 @@
             icon="el-icon-search"
             style="margin-left: 10px"
             @click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
-          <el-tooltip effect="dark" content="更改选中的零件的询价状态" placement="top" open-delay="1000">
+          <el-tooltip :open-delay="1000" effect="dark" content="更改选中的零件的询价状态" placement="top">
             <el-button
               type="primary"
               size="small"
@@ -27,7 +27,7 @@
               style="margin-left: 10px"
               @click="changeInquiryStatus">变更询价状态</el-button>
           </el-tooltip>
-          <el-tooltip effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top" open-delay="1000">
+          <el-tooltip :open-delay="1000" effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top">
             <el-button
               type="warning"
               size="small"
@@ -232,7 +232,7 @@
           </el-table-column>
           <el-table-column label="设置" min-width="70" align="center">
             <template slot-scope="scope">
-              <el-tooltip effect="dark" content="设置安全库存量" placement="top" open-delay="1000">
+              <el-tooltip :open-delay="1000" effect="dark" content="设置安全库存量" placement="top">
                 <el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
                 <el-button
                   v-else
@@ -333,7 +333,7 @@
           <template slot-scope="scope">
             <el-button :disabled="arrival(scope.row)" type="warning" plain size="mini" @click="editOfflineContract(scope.row)">编辑</el-button>
             <el-button :disabled="arrival(scope.row)" type="danger" plain size="mini" @click="deleteOfflineContract(scope.row)">删除</el-button>
-            <el-tooltip effect="dark" content="导出合同" placement="top" open-delay="1000">
+            <el-tooltip :open-delay="1000" effect="dark" content="导出合同" placement="top">
               <el-button type="warning" size="mini" plain @click="exportExcel(scope.row)">导出</el-button>
             </el-tooltip>
 
@@ -350,7 +350,7 @@
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange2"
           @current-change="handleCurrentChange2"/>
-        <el-tooltip effect="dark" content="生成合同" placement="top" open-delay="1000">
+        <el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
           <el-button :disabled="disable" type="success" size="mini" style="float:right;margin-left:10px" @click="doneOfflineContact">生成</el-button>
         </el-tooltip>
         <el-button :disabled="disable" type="info" size="mini" style="float:right" @click="saveContract">保存</el-button>
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/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index f381ba9d..80e6f0b3 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -60,7 +60,7 @@
             icon="el-icon-search"
             style="margin-left:10px"
             @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-          <el-tooltip effect="dark" content="打印采购合同" placement="top" open-delay="1000">
+          <el-tooltip :open-delay="1000" effect="dark" content="打印采购合同" placement="top">
             <el-button
               type="warning"
               size="small"
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 2ef15195..8f3231a6 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -30,7 +30,7 @@
         <span>型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
         <el-input v-model="model" placeholder="型号" size="small" clearable style="width:200px"/>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
-        <el-tooltip effect="dark" content="将全部采购件导出到表格" placement="top" open-delay="1000">
+        <el-tooltip :open-delay="1000" effect="dark" content="将全部采购件导出到表格" placement="top">
           <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 15px" @click="exportDetail()">导出</el-button>
         </el-tooltip>
       </el-row>
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 8f6c996e..b2432f95 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -212,7 +212,7 @@
             </el-table-column>
             <el-table-column align="center" label="撤回分配" min-width="100px" fixed="right">
               <template slot-scope="scope">
-                <el-tooltip effect="dark" content="撤回已分配的采购任务" placement="top" open-delay="1200">
+                <el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">
                   <el-button
                     :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
                     type="primary"
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..c4668702 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;"/>
@@ -551,7 +555,7 @@ export default {
       })
     },
     allDelete() {
-      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index e338bb96..836fe674 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,11 @@
                   :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>
             </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: 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 3049d747..f9e57956 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,17 +11,19 @@
             :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"
             :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-button type="danger" icon="el-icon-delete" plain size="small" @click="allDelete">一键删除</el-button>
+        <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">
           <span>机床名称：</span>
           <el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/>
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index d1ac5986..9310adc5 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -28,13 +28,13 @@
       <el-col style="margin-left: 0px">
         <span>零件图号:</span>
         <el-input v-model="partDrawingNumber" placeholder="零件图号" size="small" clearable style="margin: 3px 0"/>
-        <el-tooltip effect="dark" content="查询备料零件" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="查询备料零件" placement="top">
           <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
         </el-tooltip>
-        <el-tooltip effect="dark" content="向选择的采购单里添加采购零件" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="向选择的采购单里添加采购零件" placement="top">
           <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入物料</el-button>
         </el-tooltip>
-        <el-tooltip effect="dark" content="将零件打回重新分配备料计划" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="将零件打回重新分配备料计划" placement="top">
           <el-button type="danger" size="small" icon="el-icon-download" style="margin-left: 10px" @click="back">打回</el-button>
         </el-tooltip>
         <el-table v-loading="loading1" :data="tableData1" border stripe highlight-current-row style="width: 100%;margin-top:3px;" height="330" size="mini" @selection-change="handleSelectionChange">
@@ -79,11 +79,11 @@
         <el-input v-model="purchasingOrder" placeholder="采购单号" size="small" style="margin: 3px 0" clearable/>
         <span style="margin-left: 10px">供应商:</span>
         <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
-        <el-tooltip effect="dark" content="查询采购单" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="查询采购单" placement="top">
           <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
         </el-tooltip>
         <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购单</el-button>
-        <el-tooltip effect="dark" content="保存选中的采购单" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购单" placement="top">
           <el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存</el-button>
         </el-tooltip>
       </div>
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
diff --git a/src/views/WorkshopProcurement/OfflineContract1/index.vue b/src/views/WorkshopProcurement/OfflineContract1/index.vue
index 652262cc..e1155ca4 100644
--- a/src/views/WorkshopProcurement/OfflineContract1/index.vue
+++ b/src/views/WorkshopProcurement/OfflineContract1/index.vue
@@ -131,7 +131,7 @@
           @click="addMateriel">选入物料</el-button>
       </div>
       <el-table v-loading="" :data="tableData2" border style="max-height: 460px;" height="460px" size="mini" highlight-current-row @row-click="searchTable3">
-        <el-table-column type="expand" fixed="left">
+        <el-table-column label="详情" type="expand" fixed="left">
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
               <el-form-item label="离线合同备注">
diff --git a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue
index 38191a6b..c05810b5 100644
--- a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue
@@ -12,7 +12,7 @@
         </el-select>
         <span style="margin-left: 10px">供应商:</span>
         <el-input v-model="supplierName0" placeholder="供应商" style="width: 200px" size="small" clearable/>
-        <el-tooltip effect="dark" content="查询外购件到货信息" placement="top" open-delay="1200">
+        <el-tooltip :open-delay="1200" effect="dark" content="查询外购件到货信息" placement="top">
           <el-button
             type="success"
             size="small"
@@ -139,7 +139,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="70">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="输入到货信息" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1200" effect="dark" content="输入到货信息" placement="top">
               <div style="display: inline-block">
                 <el-button el-button type="success" size="mini" icon="el-icon-goods" plain @click="OpenArrival(scope.row)">到货</el-button>
               </div>