diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js
index d22ce193..4f509941 100644
--- a/src/api/Inventory/CreatePickingList.js
+++ b/src/api/Inventory/CreatePickingList.js
@@ -7,7 +7,7 @@ export function initPickPerson() {
     method: 'post',
     data: {
       type: '3',
-      name: 'select 姓名,人员编号 from 人事档案管理_人员名单 where 是否离职 = 0'
+      name: 'select 姓名,人员编号 from 人事档案管理_人员名单 where 是否离职 = 0 order by 姓名 '
     }
   })
 }
diff --git a/src/assets/img/img12.png b/src/assets/img/img12.png
index c4c53c05..c6606389 100644
Binary files a/src/assets/img/img12.png and b/src/assets/img/img12.png differ
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 40584490..edb9e08d 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -243,3 +243,34 @@ h3 {
   font-weight:bold;
   color: black;
 }
+//生成
+.el-button--shengcheng{
+  background: #ffffff;
+  border-color: rgb(255,151,89);
+  color: rgb(255,151,89);
+  &:hover{
+    background: #ffffff;
+    border-color: rgb(255,151,89);
+    color: rgb(255,151,89);
+  }
+  &:focus{
+    background: #ffffff;
+    border-color: rgb(255,151,89);
+    color: rgb(255,151,89);
+  }
+}
+.el-button--baocun.is-disabled{
+  background:	LightGreen;
+  border-color:	LightGreen;
+  color: white;
+  &:hover{
+    background:	LightGreen;
+    border-color:	LightGreen;
+    color: white;
+  }
+  &:focus{
+    background:	LightGreen;
+    border-color: LightGreen;
+    color: white;
+  }
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 8ff60856..8eaacaf2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,7 +23,7 @@ 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({
-  baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index 99a7f1b1..79f3c16c 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -69,14 +69,14 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="430px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" size="small" @click="handlestart_1(scope.row)">开始装配</el-button>
-            <el-button v-if="scope.row.装配状态===1" type="danger" size="small" @click="handleend_1(scope.row)">结束装配</el-button>
-            <el-button v-if="scope.row.装配状态===2" type="info" size="small" >装配完成</el-button>
+            <el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" plain size="small" @click="handlestart_1(scope.row)">开始装配</el-button>
+            <el-button v-if="scope.row.装配状态===1" type="danger" plain size="small" @click="handleend_1(scope.row)">结束装配</el-button>
+            <el-button v-if="scope.row.装配状态===2" type="info" plain size="small" >装配完成</el-button>
             <el-button v-if="scope.row.装配状态===1" plain size="small" @click="handleCancelStart_1(scope.row)">取消开始装配</el-button>
             <el-button v-if="scope.row.装配状态===2" plain size="small" @click="handleCancelEnd_1(scope.row)">取消结束装配</el-button>
-            <el-button v-if="scope.row.调试状态===null || scope.row.调试状态===0" type="success" size="small" @click="handlestart_2(scope.row)">开始调试</el-button>
-            <el-button v-if="scope.row.调试状态===1" type="danger" size="small" @click="handleend_2(scope.row)">结束调试</el-button>
-            <el-button v-if="scope.row.调试状态===2" type="info" size="small" >调试完成</el-button>
+            <el-button v-if="scope.row.调试状态===null || scope.row.调试状态===0" type="success" plain size="small" @click="handlestart_2(scope.row)">开始调试</el-button>
+            <el-button v-if="scope.row.调试状态===1" type="danger" plain size="small" @click="handleend_2(scope.row)">结束调试</el-button>
+            <el-button v-if="scope.row.调试状态===2" type="info plain" size="small" >调试完成</el-button>
             <el-button v-if="scope.row.调试状态===1" plain size="small" @click="handleCancelStart_2(scope.row)">取消开始调试</el-button>
             <el-button v-if="scope.row.调试状态===2" plain size="small" @click="handleCancelEnd_2(scope.row)">取消结束调试</el-button>
           </template>
@@ -131,12 +131,14 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="300px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="!scope.row.isEditing" type="primary" size="small" @click="editTable2(scope.row)">编辑</el-button>
-            <el-button v-if="scope.row.isEditing" type="primary" size="small" @click="submitTable2(scope.row)">确定</el-button>
-            <el-button v-if="scope.row.isEditing" size="small" @click="cancelTable2(scope.row)">取消</el-button>
-            <el-button v-if="scope.row.buttonStatus === 1" type="success" size="small" @click="handlestart_3(scope.row)">开始装配</el-button>
-            <el-button v-if="scope.row.buttonStatus === 2" type="danger" size="small" @click="handleend_3(scope.row)">结束装配</el-button>
-            <el-button v-if="scope.row.buttonStatus === 3" type="info" size="small" >装配完成</el-button>
+            <el-tooltip effect="dark" content="编辑部装工时" placement="top" open-delay="1200">
+              <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>
+            <el-button v-if="scope.row.isEditing" size="small" plain @click="cancelTable2(scope.row)">取消</el-button>
+            <el-button v-if="scope.row.buttonStatus === 1" type="success" plain size="small" @click="handlestart_3(scope.row)">开始装配部件</el-button>
+            <el-button v-if="scope.row.buttonStatus === 2" type="danger" plain size="small" @click="handleend_3(scope.row)">结束装配</el-button>
+            <el-button v-if="scope.row.buttonStatus === 3" type="info" plain size="small" >装配完成</el-button>
             <el-button v-if="scope.row.buttonStatus === 2" plain size="small" @click="handleCancelStart_3(scope.row)">取消开始装配</el-button>
             <el-button v-if="scope.row.buttonStatus === 3" plain size="small" @click="handleCancelEnd_3(scope.row)">取消结束装配</el-button>
           </template>
diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue
index b49aecf2..f6475a73 100644
--- a/src/views/Assembly/AssemblyQualityInspection/index.vue
+++ b/src/views/Assembly/AssemblyQualityInspection/index.vue
@@ -34,11 +34,13 @@
             :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-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
+        <el-tooltip effect="dark" content="导出查询数据" placement="top" open-delay="1000">
+          <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
+        </el-tooltip>
       </el-row>
     </el-card>
     <el-card>
-      <el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="500px">
+      <el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="600px">
         <el-table-column align="center" label="检验情况" width="80px">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag>
diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue
index ad0cd019..b64f6ed0 100644
--- a/src/views/Assembly/MakeAssemblyPlan/index.vue
+++ b/src/views/Assembly/MakeAssemblyPlan/index.vue
@@ -97,10 +97,10 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="scope.row.edit" type="primary" size="small" @click="cancel(scope.row)">取消</el-button>
-            <el-button type="danger" size="small" @click="deleteData(scope.row)">删除</el-button>
+            <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+            <el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+            <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+            <el-button type="danger" plain size="small" @click="deleteData(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Assembly/MakeColdWorkPlan/index.vue b/src/views/Assembly/MakeColdWorkPlan/index.vue
index 785a18cb..5545911a 100644
--- a/src/views/Assembly/MakeColdWorkPlan/index.vue
+++ b/src/views/Assembly/MakeColdWorkPlan/index.vue
@@ -97,10 +97,10 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="scope.row.edit" type="primary" size="small" @click="cancel(scope.row)">取消</el-button>
-            <el-button type="danger" size="small" @click="deleteData(scope.row)">删除</el-button>
+            <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+            <el-button v-else type="warning" plain size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+            <el-button v-if="scope.row.edit" type="primary" plain size="small" @click="cancel(scope.row)">取消</el-button>
+            <el-button type="danger" plain size="small" @click="deleteData(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Assembly/MakeElectricalAssembly/index.vue b/src/views/Assembly/MakeElectricalAssembly/index.vue
index fbe5f185..7c947448 100644
--- a/src/views/Assembly/MakeElectricalAssembly/index.vue
+++ b/src/views/Assembly/MakeElectricalAssembly/index.vue
@@ -57,7 +57,7 @@
       </el-table>
     </el-card>
     <el-card>
-      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加电气计划</el-button>
+      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">新增电气计划</el-button>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
@@ -97,10 +97,10 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="scope.row.edit" type="primary" size="small" @click="cancel(scope.row)">取消</el-button>
-            <el-button type="danger" size="small" @click="deleteData(scope.row)">删除</el-button>
+            <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+            <el-button v-else type="warning" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+            <el-button v-if="scope.row.edit" type="primary" plain size="small" @click="cancel(scope.row)">取消</el-button>
+            <el-button type="danger" plain size="small" @click="deleteData(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Assembly/MakePaintPlan/index.vue b/src/views/Assembly/MakePaintPlan/index.vue
index 63e291d4..fc6bfb7e 100644
--- a/src/views/Assembly/MakePaintPlan/index.vue
+++ b/src/views/Assembly/MakePaintPlan/index.vue
@@ -97,10 +97,10 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="scope.row.edit" type="primary" size="small" @click="cancel(scope.row)">取消</el-button>
-            <el-button type="danger" size="small" @click="deleteData(scope.row)">删除</el-button>
+            <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+            <el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+            <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+            <el-button type="danger" size="small" plain @click="deleteData(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index bf88644b..b413ecb5 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -66,11 +66,13 @@
             :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-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
+        <el-tooltip effect="dark" content="导出查询数据" placement="top" open-delay="1000">
+          <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
+        </el-tooltip>
       </el-row>
     </el-card>
     <el-card>
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
+      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
         <el-table-column align="center" label="禁用情况" width="80px">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.是否禁用)===0||scope.row.是否禁用===''" type="success" size="small" @click="approvalPass(scope.row)">未禁用</el-tag>
@@ -257,7 +259,7 @@
     </el-card>
     <el-card>
       <h4 style="margin-left: 45%;">正在加工零件列表</h4>
-      <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
+      <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
         <el-table-column label="机床图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
@@ -327,7 +329,7 @@
     </el-card>
     <el-card>
       <h4 style="margin-left: 45%;">待加工零件列表</h4>
-      <el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
+      <el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
         <el-table-column label="机床图号" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue
index 860f4119..a0a3f650 100644
--- a/src/views/Assembly/SparePartsOutStockRecord/index.vue
+++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue
@@ -39,7 +39,9 @@
           style="width: 130px"
           type="date"
           placeholder="选择日期"/>
-        <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 effect="dark" content="查询备料出库记录" placement="top" open-delay="1200">
+          <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>
     </el-card>
     <el-card>
diff --git a/src/views/BasicData/MaintenanceEquipmentPerson/index.vue b/src/views/BasicData/MaintenanceEquipmentPerson/index.vue
index 301625a8..8fa29bcc 100644
--- a/src/views/BasicData/MaintenanceEquipmentPerson/index.vue
+++ b/src/views/BasicData/MaintenanceEquipmentPerson/index.vue
@@ -12,7 +12,7 @@
       <span>操作者:</span>
       <el-input v-model="operator" placeholder="操作者" size="small" clearable style="width:200px" @dblclick.native="getOperator();param = 0"/>
       <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getTableData">查询</el-button>
-      <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" @click="handleAdd">增加</el-button>
+      <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" @click="handleAdd">新增</el-button>
     </el-card>
     <el-card>
       <el-table v-loading="loading" :data="tableData" stripe highlight-current-row border style="height: 500px">
@@ -115,7 +115,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
-        <el-button v-show="title === '增加'" type="primary" @click="submitAdd()">确定</el-button>
+        <el-button v-show="title === '新增设备人员关系'" type="primary" @click="submitAdd()">确定</el-button>
         <el-button v-show="title === '编辑'" type="primary" @click="submitEdit()">确定</el-button>
       </div>
     </el-dialog>
@@ -202,7 +202,7 @@ export default {
       this.getTable(getTableData, [this.equipmentNameCheck, this.equipmentNameValue, this.operatorCheck, this.operatorNum, this.pageCurrent, this.pageSize], ['tableData', 'total', 'loading'])
     },
     handleAdd() {
-      this.addForm('form', [this.dialogFormVisible_form = true, this.title = '增加'])
+      this.addForm('form', [this.dialogFormVisible_form = true, this.title = '新增设备人员关系'])
     },
     handleEdit(row) {
       this.No = row.设备人员关系流水号
diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue
index c60e6d88..783436aa 100644
--- a/src/views/BasicData/PartsNumberMaintenance/index.vue
+++ b/src/views/BasicData/PartsNumberMaintenance/index.vue
@@ -34,14 +34,17 @@
     </el-card>
     <el-card>
       <div>
-        <span style="font-size: 20px;margin-bottom: 20px">基本件三表数量</span>
-        <el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
+        <span style="font-size: 20px">基本件三表数量</span>
+        <el-tooltip effect="dark" content="删除基本件三表数量" placement="top" open-delay="1000">
+          <el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
+        </el-tooltip>
       </div>
       <el-table
         v-loading="loading"
         :data="tableData"
         highlight-current-row
         border
+        stripe
         size="mini"
         style="width: 100%;max-height: 520px"
         height="320">
@@ -121,16 +124,23 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="type=1;handleEdit(scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)">删除</el-button>
+
+            <el-tooltip effect="dark" content="编辑零件数量" placement="top" open-delay="1000">
+              <el-button
+                size="mini"
+                type="primary"
+                plain
+                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-button
+                size="mini"
+                type="danger"
+                plain
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)">删除</el-button>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -147,8 +157,10 @@
     </el-card>
     <el-card>
       <div>
-        <span style="font-size: 20px;margin-bottom: 20px">外购件和标准件三表数量</span>
-        <el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
+        <span style="font-size: 20px">外购件和标准件三表数量</span>
+        <el-tooltip effect="dark" content="删除外购件和标准件数量" placement="top" open-delay="1000">
+          <el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
+        </el-tooltip>
       </div>
       <el-table
         v-loading="loadingWB"
@@ -241,7 +253,7 @@
     </el-card>
     <el-card>
       <div>
-        <div style="font-size: 20px;margin-bottom: 20px">未投产数量</div>
+        <div style="font-size: 20px">未投产数量</div>
         <el-table
           :data="tableData1"
           border
@@ -305,7 +317,7 @@
       </div>
     </el-card>
     <el-card>
-      <div style="font-size: 20px;margin-bottom: 20px">未平衡数量</div>
+      <div style="font-size: 20px">未平衡数量</div>
       <el-table
         :data="tableData2"
         border
@@ -363,7 +375,7 @@
       </div>
     </el-card>
     <el-card>
-      <div style="font-size: 20px;margin-bottom: 20px">未分配采购零件数量</div>
+      <div style="font-size: 20px">未分配采购零件数量</div>
       <el-tabs type="border-card" @tab-click="searchTable1();searchTable2()">
         <el-tab-pane label="标准件和外购件">
           <el-table :data="tableData3" size="mini" style="max-height: 320px" height="320px" border>
@@ -617,7 +629,7 @@
         </el-tab-pane>
       </el-tabs>
     </el-card>
-    <el-dialog :visible.sync="dialogFormVisible3" title="更改数量" center style="min-height: 300px" width="400px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="更改数量" center style="min-height: 300px" width="400px">
       <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="数量" prop="数量">
           <el-input
diff --git a/src/views/BasicData/ShiftManagement/index.vue b/src/views/BasicData/ShiftManagement/index.vue
index 95d37e8c..f1f56607 100644
--- a/src/views/BasicData/ShiftManagement/index.vue
+++ b/src/views/BasicData/ShiftManagement/index.vue
@@ -10,76 +10,81 @@
           :value="item.value"/>
       </el-select>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="searchTable()">查询</el-button>
-      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addShifttable()">增加</el-button>
-      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="ShiftType()">班次类型工作时间</el-button>
+      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addShifttable()">新增</el-button>
+      <el-button type="warning" icon="el-icon-circle-plus-outline" plain size="small" @click="ShiftType()">班次类型工作时间</el-button>
     </el-card>
 
     <el-card>
       <el-table
         :data="tableData"
         border
+        stripe
         size="mini"
-        style="width: 100%;height: 550px;">
-        <el-table-column label="开始工作时间">
+        height="550"
+        center
+        style="width: 100%">
+        <el-table-column label="开始工作时间" align="center">
           <template slot-scope="scope">
             {{ scope.row.开始工作时间 }}
           </template>
         </el-table-column>
-        <el-table-column disabled label="结束工作时间" >
+        <el-table-column disabled label="结束工作时间" align="center">
           <template slot-scope="scope">
             {{ scope.row.结束工作时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="班次类型">
+        <el-table-column label="班次类型" align="center">
           <template slot-scope="scope">
             {{ scope.row.班次类型 }}
           </template>
         </el-table-column>
-        <el-table-column label="班次代码">
+        <el-table-column label="班次代码" align="center">
           <template slot-scope="scope">
             {{ scope.row.班次代码 }}
           </template>
         </el-table-column>
-        <el-table-column label="是否夜班">
+        <el-table-column label="是否夜班" align="center">
           <template slot-scope="scope">
             {{ scope.row.是否夜班 }}
           </template>
         </el-table-column>
-        <el-table-column label="是否工作">
+        <el-table-column label="是否工作" align="center">
           <template slot-scope="scope">
             {{ scope.row.是否工作 }}
           </template>
         </el-table-column>
-        <el-table-column label="是否工作">
+        <el-table-column label="是否工作" align="center">
           <template slot-scope="scope">
             {{ scope.row.是否工作 }}
           </template>
         </el-table-column>
-        <el-table-column label="日工作能力">
+        <el-table-column label="日工作能力" align="center">
           <template slot-scope="scope">
             {{ scope.row.日工作能力 }}
           </template>
         </el-table-column>
-        <el-table-column label="是否可以安排高难度件">
+        <el-table-column label="是否可以安排高难度件" align="center">
           <template slot-scope="scope">
             {{ scope.row.是否可以安排高难度件 }}
           </template>
         </el-table-column>
-        <el-table-column label="备注">
+        <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="200">
+        <el-table-column label="操作" width="200" align="center">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="primary"
+              plain
               icon="el-icon-edit"
-              @click="aeditShifttable(scope.row)">修改</el-button>
+              @click="aeditShifttable(scope.row)">编辑</el-button>
             <el-button
               size="mini"
               type="danger"
+              plain
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
           </template>
@@ -96,7 +101,7 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
-    <el-dialog :visible.sync ="dialogFormVisible1" title="增加" center style="min-height: 270px" width="900px">
+    <el-dialog v-el-drag-dialog :visible.sync ="dialogFormVisible1" title="新增班次人员" center style="min-height: 270px" width="900px">
       <el-form ref="form1" :model="form1" :rules="rules" label-position="right" label-width="160px" class="demo-ruleForm">
         <el-row>
           <el-col :span="10">
@@ -183,7 +188,7 @@
         <el-button type="primary" @click="submitAdd1()">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="dialogFormVisible2" title="编辑" center style="min-height: 270px" width="900px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="编辑" center style="min-height: 270px" width="900px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-col :span="10">
@@ -467,8 +472,6 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom:15px;
-    margin-left: 15px;
-    margin-right: 15px;
+    margin: 0px;
   }
 </style>
diff --git a/src/views/BasicData/SystemRrolemaintenance/index.vue b/src/views/BasicData/SystemRrolemaintenance/index.vue
index d43cd398..3f4c889e 100644
--- a/src/views/BasicData/SystemRrolemaintenance/index.vue
+++ b/src/views/BasicData/SystemRrolemaintenance/index.vue
@@ -6,7 +6,7 @@
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="pageCurrent=1;pageSize = 10;searchData()">查询</el-button>
       <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
     </el-card>
-    <el-card style="margin-top: 15px">
+    <el-card style="margin-top: 0px">
       <el-table
         v-loading="loading"
         :data="tableData"
@@ -32,11 +32,13 @@
             <el-button
               size="mini"
               type="primary"
+              plain
               icon="el-icon-edit"
               @click="handleEdit(scope.row)">编辑</el-button>
             <el-button
               size="mini"
               type="danger"
+              plain
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
           </template>
@@ -54,7 +56,7 @@
       </div>
     </el-card>
 
-    <el-dialog :visible.sync="dialogFormVisible1" title="新增角色" center style="min-height: 200px" width="400px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="新增角色" center style="min-height: 200px" width="400px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
         <el-form-item label="角色名称" prop="角色功能" style="display: inline-block">
           <el-input
@@ -212,7 +214,8 @@ export default {
   }
 }
 </script>
-
 <style scoped>
-
+  .el-card{
+    margin: 0px;
+  }
 </style>
diff --git a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
index 649c6208..88b60d6f 100644
--- a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
+++ b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
@@ -18,42 +18,49 @@
       </el-card>
 
       <el-card>
-        <el-table :data="tableData" highlight-current-row>
-          <el-table-column label="员工姓名">
+        <el-table :data="tableData" highlight-current-row stripe size="mini" height="550" border style="width: 100%">
+          <el-table-column
+            label="序号"
+            align="center"
+            type="index"
+            width="50"/>
+          <el-table-column label="员工姓名" align="center">
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
             </template>
           </el-table-column>
-          <el-table-column disabled label="所属部门" >
+          <el-table-column disabled label="所属部门" align="center">
             <template slot-scope="scope">
               {{ scope.row.部门名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="岗位名称">
+          <el-table-column label="岗位名称" align="center">
             <template slot-scope="scope">
               {{ scope.row.岗位名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="角色名称">
+          <el-table-column label="角色名称" align="center">
             <template slot-scope="scope">
               {{ scope.row.角色功能 }}
             </template>
           </el-table-column>
-          <el-table-column label="考勤编号">
+          <el-table-column label="考勤编号" align="center">
             <template slot-scope="scope">
               {{ scope.row.考勤编号 }}
             </template>
           </el-table-column>
-          <el-table-column label="操作">
+          <el-table-column label="操作" align="center">
             <template slot-scope="scope">
               <el-button
                 size="mini"
                 type="primary"
+                plain
                 icon="el-icon-edit"
                 @click="submitEdit(scope.$index, scope.row)">修改</el-button>
               <el-button
                 size="mini"
                 type="danger"
+                plain
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)">删除</el-button>
             </template>
@@ -72,7 +79,7 @@
       </el-card>
     </table>
 
-    <el-dialog :visible.sync="dialogFormVisible" title="人员信息" center width="750px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="人员信息" center width="750px">
       <div style="height: 500px">
         <div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
           <el-tree
@@ -111,7 +118,7 @@
       <el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogFormVisible1" title="增加" center style="min-height: 270px" width="800px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="增加" center style="min-height: 270px" width="800px">
       <el-form ref="form1" :model="form1" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
@@ -148,7 +155,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogFormVisible2" title="编辑" center style="min-height: 270px" width="800px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="编辑" center style="min-height: 270px" width="800px">
       <el-form ref="form2" :model="form2" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
@@ -393,8 +400,6 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom:15px;
-    margin-left: 15px;
-    margin-right: 15px;
+    margin: 0px;
   }
 </style>
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index af1c7b22..6ccef91b 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -196,9 +196,11 @@
         <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
         <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
         <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="createList()">创建</el-button>
-        <el-button size="small" type="primary" icon="el-icon-bottom" style="margin: 0 0 0 10px" @click="selectInto()">选入</el-button>
       </div>
-      <h4 style="margin-top:0">领料单</h4>
+      <span style="margin:0;width: 100px;font-size: 20px">领料单</span>
+      <el-tooltip effect="dark" content="为所选领料单增加物料明细" placement="top" open-delay="1200">
+        <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">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="领料单编号" align="center" min-width="200">
@@ -236,7 +238,7 @@
         <el-table-column label="操作" align="center" width="230px">
           <template slot-scope="scope" align="center">
             <!--<el-button v-if="Number(token)===21 || Number(token)===36" :disabled="Number(scope.row.是否审批)===0 || Number(scope.row.是否启用)===0" size="mini" type="primary" @click="checkList(scope.row)">确认领回</el-button>-->
-            <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="danger" icon="el-icon-delete" @click="dropList(scope.row)">删除</el-button>
+            <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" plain type="danger" icon="el-icon-delete" @click="dropList(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -295,25 +297,25 @@
         </el-table-column>
         <el-table-column v-if="true" label="备料确认" align="center" width="100">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否备料确认)===1" type="success" size="mini">已确认</el-tag>
-            <el-tag v-else type="warning" size="mini">未确认</el-tag>
+            <el-tag v-if="Number(scope.row.是否备料确认)===1" type="success" size="mini">已备料</el-tag>
+            <el-tag v-else type="warning" size="mini">未备料</el-tag>
           </template>
         </el-table-column>
         <el-table-column v-if="true" label="领料确认" align="center" width="100">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否领料确认)===1" type="success" size="mini">已确认</el-tag>
-            <el-tag v-else type="warning" size="mini">未确认</el-tag>
+            <el-tag v-if="Number(scope.row.是否领料确认)===1" type="success" size="mini">已领料</el-tag>
+            <el-tag v-else type="warning" size="mini">未领料</el-tag>
           </template>
         </el-table-column>
         <el-table-column v-if="true" label="操作" align="center" width="100">
           <template slot-scope="scope">
-            <el-button :disabled="!!scope.row.是否出库 || Number(scope.row.是否领料确认)===1" size="mini" type="danger" icon="el-icon-delete" @click="dropListDetail(scope.row)">删除</el-button>
+            <el-button :disabled="!!scope.row.是否出库 || Number(scope.row.是否领料确认)===1" size="mini" plain type="danger" icon="el-icon-delete" @click="dropListDetail(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
 
-    <el-dialog :visible.sync="dialogFormVisible1" title="创建领料单" center width="380px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="创建领料单" center width="380px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
         <el-form-item label="领料人" prop="领料人流水号" label-width="100px" size="small">
           <el-select v-model="form1.领料人流水号" placeholder="请选择" size="small" clearable filterable>
diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index f9d0e835..5befe324 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -5,8 +5,12 @@
         <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-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" plain @click="Empty()">清空</el-button>
-        <el-button type="warning" size="small" class="el-icon-success" style="margin: 0 0 0 10px" plain @click="Innumber">入库</el-button>
+        <el-tooltip effect="dark" content="清除所有机床零件信息" placement="top" open-delay="1200">
+          <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-button type="warning" size="small" class="el-icon-success" style="margin: 0 0 0 10px" plain @click="Innumber">入库</el-button>
+        </el-tooltip>
       </el-row>
     </el-card>
 
@@ -14,7 +18,7 @@
       <el-table
         v-loading="listLoading"
         :data="tableDataNum"
-        stripe="true"
+        stripe
         highlight-current-row
         border
         size="mini"
@@ -79,13 +83,15 @@
         </el-table-column>
         <el-table-column label="操作" min-width="100" align="center">
           <template slot-scope="scope">
-            <el-button
-              :disabled="scope.row.是否禁用"
-              size="mini"
-              type="danger"
-              plain
-              class="el-icon-delete"
-              @click="handleDelete(scope.$index, scope.row)">移除</el-button>
+            <el-tooltip effect="dark" content="清除该条零件信息" placement="top" open-delay="1200">
+              <el-button
+                :disabled="scope.row.是否禁用"
+                size="mini"
+                type="danger"
+                plain
+                class="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)">移除</el-button>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index 17d54b8c..d31cc62e 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -100,7 +100,7 @@
       </div>
     </el-card>
 
-    <el-dialog :visible.sync="dialogVisible" title="新增" center style="min-height: 300px" width="880px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="新增" center style="min-height: 300px" width="880px">
       <el-row>
         <el-col style="width: 240px">
           <span>物料名称:</span>
diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index d8918027..8d04d4ad 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -103,7 +103,7 @@
       </el-table>
     </el-card>
     <!--仓库表单-->
-    <el-dialog :visible.sync="dialogFormVisible" title="仓库" center width="450px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="仓库" center width="450px">
       <el-form ref="form" :model="form" :rules="rules" label-position="center" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
@@ -180,7 +180,7 @@
       </div>
     </el-dialog>
     <!--货位表单-->
-    <el-dialog :visible.sync="dialogFormVisible2" title="货位" center style="min-height: 300px" width="400px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="货位" center style="min-height: 300px" width="400px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 0864cf7e..5b78fece 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -7,7 +7,7 @@
         <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
       </div>
       <h4 style="margin-top:0">领料单</h4>
-      <el-table :data="pickListTable1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
+      <el-table :data="pickListTable1" stripe highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="领料单编号" align="center" min-width="200">
           <template slot-scope="scope">
@@ -37,10 +37,6 @@
         </el-table-column>
       </el-table>
       <el-row>
-        <el-col style="float:right;width: 200px;margin-top:15px">
-          <el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="prepareConfirm()">备料确认</el-button>
-          <el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="inputPassword()">领料确认</el-button>
-        </el-col>
         <el-col style="width:calc(100% - 600px)">
           <div class="block" style="margin: 10px 0;">
             <el-pagination
@@ -55,11 +51,15 @@
         </el-col>
       </el-row>
       <el-row style="margin: 0;">
-        <el-col style="width: 100px">
+        <el-col style="width: 300px">
           <h4>领料单明细：{{ pickingListNumberShow }}</h4>
         </el-col>
+        <el-col style="float:left;width: 200px;margin-top:15px">
+          <el-button :disabled="multipleSelection.length===0" size="small" type="warning" @click="prepareConfirm()">备料确认</el-button>
+          <el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="inputPassword()">领料确认</el-button>
+        </el-col>
       </el-row>
-      <el-table :data="pickListTable2" highlight-current-row border style="width: 100%;" size="mini" height="400" @row-click="clickListDetail" @selection-change="handleSelectionChange">
+      <el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="400" @row-click="clickListDetail" @selection-change="handleSelectionChange">
         <el-table-column type="selection" align="center" width="55"/>
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="名称" align="center" min-width="100">
@@ -109,21 +109,21 @@
         </el-table-column>
         <el-table-column v-if="true" label="备料确认" align="center" width="100">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已确认</el-tag>
-            <el-tag v-else type="warning" size="mini">未确认</el-tag>
+            <el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已备料</el-tag>
+            <el-tag v-else type="warning" size="mini">未备料</el-tag>
           </template>
         </el-table-column>
         <el-table-column v-if="true" label="领料确认" align="center" width="100">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否领料确认)===1" size="mini" type="success">已确认</el-tag>
-            <el-tag v-else type="warning" size="mini">未确认</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="100" fixed="right">
-          <template slot-scope="scope">
-            <el-button :disabled="Number(scope.row.出库数量)<=0" size="mini" icon="el-icon-back" plain type="primary" @click="sendBack(scope.row)">归还</el-button>
+            <el-tag v-if="Number(scope.row.是否领料确认)===1" size="mini" type="success">已领料</el-tag>
+            <el-tag v-else type="warning" size="mini">未领料</el-tag>
           </template>
         </el-table-column>
+        <!--<el-table-column label="操作" align="center" width="100" fixed="right">-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button :disabled="Number(scope.row.出库数量)<=0" size="mini" icon="el-icon-back" plain type="primary" @click="sendBack(scope.row)">归还</el-button>-->
+        <!--</template>-->
+        <!--</el-table-column>-->
       </el-table>
     </el-card>
 
@@ -136,7 +136,7 @@
           占用数量：{{ 占用数量 }}
         </el-col>
       </el-row>
-      <el-table :data="StockNumberTable" border style="width: 100%;" size="mini" height="300" show-summary>
+      <el-table :data="StockNumberTable" border stripe style="width: 100%;" size="mini" height="300" show-summary>
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index f3ca4be3..e4a46494 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" size="mini" border style="width: 100%;" height="440" @row-click="searchoutRecord">
+      <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border 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">
diff --git a/src/views/Inventory/OutPartSelect/index.vue b/src/views/Inventory/OutPartSelect/index.vue
index 0de67ea2..fbc58e6b 100644
--- a/src/views/Inventory/OutPartSelect/index.vue
+++ b/src/views/Inventory/OutPartSelect/index.vue
@@ -30,7 +30,7 @@
         v-loading="listLoading1"
         :data="tableData1"
         class="table"
-        stripe="true"
+        stripe
         size="mini"
         highlight-current-row
         border
diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue
index 579001c7..c45fc70c 100644
--- a/src/views/Inventory/StockInquiry/index.vue
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -29,7 +29,7 @@
       <el-table
         v-loading="listLoading1"
         :data="tableData1"
-        stripe="true"
+        stripe
         size="mini"
         highlight-current-row
         class="table"
diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
index 67371a06..6178a82c 100644
--- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
+++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
@@ -43,14 +43,16 @@
         <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-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button>
+        <el-tooltip effect="dark" content="新增补录工时" placement="top" open-delay="1200">
+          <el-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button>
+        </el-tooltip>
       </el-row>
     </el-card>
 
     <el-card>
       <el-table
         :data="tableData"
-        :stripe="true"
+        stripe
         height="550"
         size="mini"
         highlight-current-row
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 10e67751..2c38a458 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -5,10 +5,15 @@
         <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-checkbox v-model="all" size="small">查询全部</el-checkbox>-->
-        <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportTable('BL')">导出备料单</el-button>
-        <el-button type="info" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
-        <el-button type="warning" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
+        <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>
+        <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>
       </el-row>
     </el-card>
 
diff --git a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
index f4d5f9ac..ac0edbed 100644
--- a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
@@ -26,9 +26,9 @@
       <el-table
         :data="tableDataA"
         border
-        style="width: 100%;max-height: 450px;margin-top: 10px"
+        style="width: 100%;max-height: 450px"
+        stripe
         height="450px"
-        highlight-current-row
         size="small">
         <el-table-column
           type="index"
@@ -82,7 +82,7 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
-    <el-card style="width: 49.7%; float: left;margin-right: 5px">
+    <el-card style="width: 49.8%; float: left;margin-right: 5px">
       <div id="myChart1" style="width: 1000px; height: 570px; margin: auto"/>
     </el-card>
     <el-card style="width: 49.7%;margin-left: 5px">
@@ -268,7 +268,6 @@ export default {
       const xData = []
       const lineData = []
       for (let i = 0; i < this.table.length; i++) {
-        console.log(this.table[i].日期, 1111)
         xData.push(this.table[i].日期.split(' ')[0])
         lineData.push(this.table[i].利用率.toFixed(2))
       }
@@ -324,8 +323,8 @@ export default {
       myChart.clear()
       myChart.setOption({
         title: {
-          text: '单台设备状态',
-          x: 350
+          text: this.MachineValue + '设备状态' + '(' + this.Time + ')',
+          x: 250
         },
         tooltip: {
           trigger: 'item',
@@ -364,8 +363,8 @@ export default {
       myChart.clear()
       myChart.setOption({
         title: {
-          text: '全员设备状态',
-          x: 350
+          text: '全员设备状态' + '(' + this.Time + ')',
+          x: 300
         },
         tooltip: {
           trigger: 'item',
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index 819adf15..a91cb3b0 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -29,6 +29,7 @@
         :data="tableData"
         :summary-method="getSummaries"
         style="width: 100%"
+        highlight-current-row
         height="400"
         size="mini"
         show-summary
@@ -71,7 +72,7 @@
         </el-table-column>
         <el-table-column align="center" label="操作" fixed="right">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="processingStatus(scope.row)">查看加工进度</el-button>
+            <el-button type="primary" plain size="mini" @click="processingStatus(scope.row)">查看加工进度</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -316,7 +317,7 @@
           @current-change="handleCurrentChange5"/>
       </div>
     </el-card>
-    <el-dialog :visible.sync="dialogFormVisible2" title="选择机床" center style="min-height: 300px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="选择机床" center style="min-height: 300px">
       <el-table
         :data="tableData6"
         style="width:100%;max-height: 300px;display: inline-block"
@@ -377,7 +378,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogFormVisible3" title="选择组号" center style="min-height: 300px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="选择组号" center style="min-height: 300px">
       <el-table
         :data="tableData7"
         style="width:100%;max-height: 300px;display: inline-block"
@@ -428,7 +429,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogFormVisible4" title="零件加工进度" center style="min-height: 300px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" :title="titleaa" center style="min-height: 300px">
       <el-table
         :data="tableData5"
         style="width: 100%;max-height: 400px;"
@@ -480,6 +481,8 @@ import { initProject, searchTable, searchmachine, searchgroup, searchPurchaseTab
 export default {
   data() {
     return {
+      titleaa: '',
+      零件图号: '',
       entryNameValue: null, // 项目流水号
       entryName: [], // 项目数组
       machineToolNumber: '', // 机床图号
@@ -658,6 +661,7 @@ export default {
     },
     processingStatus(row) {
       this.dialogFormVisible4 = true
+      this.titleaa = row.零件图号
       processingStatus(row.工艺计划流水号).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           if (response.data[i].计划日期 !== '' && response.data[i].计划日期 !== null) {
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 205b1789..787ed697 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -192,9 +192,15 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
           <!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
-          <el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button>
-          <el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button>
-          <el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
+          <el-tooltip effect="dark" content="打回到零件分配" placement="top" open-delay="1200">
+            <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-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-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
+          </el-tooltip>
         </div>
       </div>
     </el-card>
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index 69b03344..a00a566d 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -28,7 +28,7 @@
         :data="tableData"
         :row-key="getRowKeys"
         :expand-row-keys="expands"
-        stripe="true"
+        stripe
         size="mini"
         highlight-current-row
         border
@@ -271,11 +271,21 @@
         <el-table-column label="操作" width="490px" align="center">
           <template slot-scope="scope">
             <div>
-              <el-button size="mini" icon="el-icon-arrow-up" type="primary" plain @click="upOne(scope.row)"/>
-              <el-button size="mini" icon="el-icon-arrow-down" type="primary" plain @click="downOne(scope.row)"/>
-              <el-button size="mini" icon="el-icon-upload2" type="primary" plain @click="TOP(scope.row)"/>
-              <el-button size="mini" icon="el-icon-download" type="primary" plain @click="Down(scope.row)"/>
-              <el-button size="mini" icon="el-icon-delete" type="danger" plain @click="outParts(scope.row)"/>
+              <el-tooltip effect="dark" content="上移" placement="top" open-delay="1200">
+                <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-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-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-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-button size="mini" icon="el-icon-delete" type="danger" plain @click="outParts(scope.row)"/>
+              </el-tooltip>
             </div>
           </template>
         </el-table-column>
diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index b988de83..0fd90e85 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -22,9 +22,15 @@
       </el-select>
       <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=10; pageCurrent=1;searchTable()">查询</el-button>
-      <el-button size="small" icon="el-icon-success" type="info" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
-      <el-button size="small" icon="el-icon-success" type="danger" style="margin-left: 10px" @click="back()">打回</el-button>
+      <el-tooltip effect="dark" content="自家备料查询" placement="top" open-delay="1200">
+        <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>
+      <el-tooltip effect="dark" content="将备料件打回重新分配" placement="top" open-delay="1200">
+        <el-button size="small" icon="el-icon-success" type="danger" style="margin-left: 10px" @click="back()">打回</el-button>
+      </el-tooltip>
     </el-card>
     <el-card>
       <el-table v-loading="loading" :data="tableData" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange2">
@@ -62,8 +68,12 @@
     <el-card>
       <span>零件图号:</span>
       <el-input v-model="partName2" 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="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">查询</el-button>
-      <el-button size="small" icon="el-icon-success" type="warning" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
+      <el-tooltip effect="dark" content="外购备料确认" placement="top" open-delay="1200">
+        <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-button size="small" icon="el-icon-success" type="warning" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
+      </el-tooltip>
     </el-card>
     <el-card>
       <el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue
index 36d9406c..e2eff73f 100644
--- a/src/views/ManufacturingCenter/ParseQuery/index.vue
+++ b/src/views/ManufacturingCenter/ParseQuery/index.vue
@@ -4447,7 +4447,7 @@ export default {
     font-weight: bold;
   }
   .el-card{
-    margin: 5px 10px 5px 10px;
+    margin: 0;
   }
   .showDiv{
     height: 380px;
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index b5d84259..b22e0eaa 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -190,9 +190,15 @@
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
         placeholder="选择日期"/>
-      <el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="purchaseRequisition()">制造部采购</el-button>
-      <el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
-      <el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
+      <el-tooltip effect="dark" content="将零件选择到采购单" placement="top" open-delay="1200">
+        <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-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-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>
     <el-card>
       <el-row>
@@ -286,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">
+            <el-tooltip effect="dark" content="编辑" placement="top" open-delay="1200">
               <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">
+            <el-tooltip effect="dark" content="移出" placement="top" open-delay="1200">
               <div style="display: inline-block">
                 <el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
               </div>
@@ -359,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">
+            <el-tooltip effect="dark" content="编辑" placement="top" open-delay="1200">
               <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">
+            <el-tooltip effect="dark" content="移出" placement="top" open-delay="1200">
               <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/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index 1d600c16..b425a0a5 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -48,7 +48,9 @@
           type="date"
           placeholder="选择日期"/>
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
-        <el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
+        <el-tooltip :open-delay="1000" effect="dark" content="导出所选机床的加工进度" placement="top">
+          <el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
+        </el-tooltip>
       </el-row>
     </el-card>
 
@@ -392,9 +394,9 @@ export default {
       }
     }
   },
-  // created() {
-  //   this.getMachine()
-  // },
+  created() {
+    this.getMachine()
+  },
   methods: {
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => {
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index d8821302..778a6f26 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -50,7 +50,7 @@
         v-loading="listLoading1"
         id="ProcessingStatusEdit"
         :data="tableData1"
-        :stripe="true"
+        stripe
         class="table"
         size="mini"
         highlight-current-row
@@ -82,37 +82,47 @@
         <el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" >
           <el-table-column label="[1]" align="center" width="120px">
             <template slot-scope="scope">
-              <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>
+              <el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
+                <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>
+              </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column label="[2]" align="center" width="120px">
             <template slot-scope="scope">
-              <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>
+              <el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
+                <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>
+              </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column label="[3]" align="center" width="120px">
             <template slot-scope="scope">
-              <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>
+              <el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
+                <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>
+              </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column label="[4]" align="center" width="120px">
             <template slot-scope="scope">
-              <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>
+              <el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
+                <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>
+              </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column label="[5]" align="center" width="120px">
             <template slot-scope="scope">
-              <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>
+              <el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
+                <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>
+              </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column label="[6]" align="center" width="120px">
@@ -340,6 +350,8 @@
             style="width: 150px;float: left"
             height="400"
             accordion
+            default-expand-all="true"
+            highlight-current="true"
             @node-click="handleNodeClick"/>
         </div>
         <el-table :data="List1" highlight-current-row height="400" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange2">
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index e587917f..5fde40f2 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -14,7 +14,6 @@
               <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
             </el-option>
           </el-select>
-          <el-button size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="asd()">查询</el-button>
           <span>分组:</span>
           <el-select v-model="NumValue" size="small" style="margin-top:10px;width: 220px" filterable clearable placeholder="机床组号">
             <el-option
@@ -25,15 +24,12 @@
           </el-select>
           <span>零件图号:</span>
           <el-input v-model="partNumber" clearable size="small" placeholder="零件图号" style="width: 200px;"/>
-
           <el-button v-if="是否扫描 === false" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total = 0;pageList = 1;getTable()">查询</el-button>
           <el-button v-if="是否扫描 === true" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total5 = 0;pageList5 = 1;getTable5()">查询</el-button>
           <el-checkbox v-if="false" v-model="是否扫描">是否扫描查询</el-checkbox>
-
         </el-row>
       </div>
     </el-card>
-
     <el-card>
       <span class="demonstration">开始日期: </span>
       <el-date-picker
@@ -51,7 +47,9 @@
         value-format="yyyy-MM-dd"
         style="top: 1px;"
         placeholder="选择开始日期"/>
-      <el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">零件计划变更</el-button>
+      <el-tooltip effect="dark" content="变更零件加工开始和结束时间" placement="top" open-delay="1200">
+        <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>
       <el-table
         v-loading="listLoading"
@@ -144,7 +142,9 @@
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
-        <el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 50px 10px 10px" @click="Selection">选入</el-button>
+        <el-tooltip effect="dark" content="将选中零件自动排出加工工序" placement="top" open-delay="1200">
+          <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>
       </div>
       <div v-if="是否扫描 === true" class="block" style="margin-top: 10px;">
@@ -431,9 +431,13 @@
             @size-change="handleSizeChange1"
             @current-change="handleCurrentChange1"/>
           <div style="float:right">
-            <el-button type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Discharge">虚拟排产</el-button>
+            <el-tooltip effect="dark" content="自动计算工序加工时间" placement="top" open-delay="1200">
+              <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-button type="danger" size="small" icon="el-icon-upload2" style="float:right;margin:5px 50px 10px 10px" @click="allOut">全部选出</el-button>
+            <el-tooltip effect="dark" content="选出重新设置零件的加工时间" placement="top" open-delay="1200">
+              <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>
         </div>
       </div>
@@ -728,7 +732,6 @@ export default {
     this.getTable()
   },
   methods: {
-    asd() {},
     // TABLE每行颜色
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex === 1) {
@@ -1606,7 +1609,7 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom: 15px;
+    margin: 0px;
   }
   .el-date-editor{
     width: 200px;
@@ -1647,7 +1650,4 @@ export default {
     background-color: lightgreen!important;
     border: 1px solid #1f2d3d;
   }
-  .el-card{
-    margin: 0px;
-  }
 </style>
diff --git a/src/views/ManufacturingCenter/RepairTimeEntry/index.vue b/src/views/ManufacturingCenter/RepairTimeEntry/index.vue
index db4f2f8e..7b3c8b86 100644
--- a/src/views/ManufacturingCenter/RepairTimeEntry/index.vue
+++ b/src/views/ManufacturingCenter/RepairTimeEntry/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>人员名称:</span>
-      <el-input v-model="personnelNumber" placeholder="请双击选择人员名称" class="input-with-select" clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
+      <span>人员姓名:</span>
+      <el-input v-model="personnelNumber" placeholder="请双击选择人员姓名" class="input-with-select" clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
       <el-button type="success" class="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchTable()">查询</el-button>
       <el-button type="primary" class="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="editType1('form');param = 0">新增</el-button>
     </el-card>
@@ -454,7 +454,7 @@ export default {
     // 增加打开
     editType1(formName) {
       if (this.personnelNumber === '' || this.personnelNumber === null) {
-        this.$message.error('请输入人员编号')
+        this.$message.error('请选择人员名称')
       } else {
         this.form.TechnologyValue = ''
         this.form.timeNumber = ''
@@ -464,7 +464,7 @@ export default {
         if (this.count1 !== 1) {
           this.$refs[formName].resetFields()
         }
-        this.title1 = '新增修补工时'
+        this.title1 = '新增' + this.personnelNumber + '修补工时'
         this.dialogFormVisible = true
       }
     },
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 2380922f..755d8924 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -17,7 +17,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>机床号:</span>
+        <span>机床图号:</span>
         <el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
           <el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
         </el-input>
@@ -27,7 +27,7 @@
         </el-input>
       </el-row>
       <el-row>
-        <span>零件号:</span>
+        <span>零件图号:</span>
         <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin-top: 10px"/>
         <span>零件状态:</span>
         <el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px">
@@ -54,7 +54,7 @@
         :data="tableData"
         style="width: 100%;max-height: 600px"
         height="600"
-        stripe="true"
+        stripe
         size="mini"
         highlight-current-row
         border>
@@ -69,12 +69,12 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件图号" min-width="160px">
+        <el-table-column align="center" label="零件图号" width="160px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件名称" min-width="170px">
+        <el-table-column align="center" label="零件名称" width="120px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -89,7 +89,7 @@
             {{ scope.row.传递时间 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件状态" width="750px">
+        <el-table-column align="center" label="零件状态" min-width="400px">
           <template slot-scope="scope">
             <el-steps :active="scope.row.考核状态" finish-status="success" simple>
               <el-step title="投产" />
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index f04367c5..a5f25df9 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -4,7 +4,9 @@
       <span>设备名称:</span>
       <el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 10px"/>
       <el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px" @click="pageCurrent = 1;fetchData()">查询</el-button>
-      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">增加</el-button>
+      <el-tooltip effect="dark" content="添加新设备" placement="top">
+        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
+      </el-tooltip>
     </el-card>
 
     <el-card>
@@ -85,7 +87,7 @@
         size="small"
         value-format="yyyy-MM-dd"
         placeholder="选择日期"/>
-      <el-tooltip effect="dark" content="设定设备参数有效时间" placement="top">
+      <el-tooltip effect="dark" content="设定设备参数有效时间" placement="top" open-delay="1200">
         <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 8a37c23e..7c3844e2 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -21,7 +21,9 @@
           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-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet1()">导出</el-button>
+        <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>
     </el-card>
     <el-card>
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 63be3e26..a2d89836 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -31,7 +31,9 @@
           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-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
+        <el-tooltip effect="dark" content="新增项目" placement="top" open-delay="1200">
+          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
+        </el-tooltip>
       </div>
     </el-card>
     <el-card>
@@ -105,12 +107,14 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="350">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="warning"
-              plain
-              icon="el-icon-plus"
-              @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
+            <el-tooltip effect="dark" content="增加机床" placement="top" open-delay="1200">
+              <el-button
+                size="mini"
+                type="warning"
+                plain
+                icon="el-icon-plus"
+                @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
+            </el-tooltip>
             <el-button
               size="mini"
               plain
diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
index 466b11e6..eb66e98b 100644
--- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
+++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
@@ -43,8 +43,9 @@
         </el-select>
         <span>零件图号:</span>
         <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
-
-        <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize2=10; pageCurrent2=1;searchPartNum()">查询</el-button>
+        <el-tooltip effect="dark" content="查询序间外协计划" placement="top" open-delay="1200">
+          <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>
     </el-card>
     <el-card>
@@ -150,7 +151,9 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-button size="small" type="primary" style="float:right;margin: 10px" @click="saveRowPrice">保存</el-button>
+      <el-tooltip effect="dark" content="保存" placement="top" open-delay="1200">
+        <el-button size="small" type="primary" style="float:right;margin: 10px" @click="saveRowPrice">保存</el-button>
+      </el-tooltip>
     </el-card>
 
     <el-dialog :visible.sync="dialogFormVisible" title="编辑" center style="min-height: 300px" width="800px">
diff --git a/src/views/Outsourcing/OutFactoryMaintenance/index.vue b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
index 76f44be6..74aa1bb4 100644
--- a/src/views/Outsourcing/OutFactoryMaintenance/index.vue
+++ b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
@@ -7,7 +7,9 @@
       <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-button type="primary" class="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
+      <el-tooltip effect="dark" content="新增外协厂家" placement="top" open-delay="1200">
+        <el-button type="primary" class="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
+      </el-tooltip>
     </el-card>
     <el-card>
       <el-table v-loading="loading0" :data="tableData" height="550" style="width: 100%;" border>
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 3de74cd7..936c2c4d 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -60,20 +60,21 @@
           label="序号"
           type="index"
           align="center"
+          fixed="left"
           width="50"/>
-        <el-table-column label="付款状态" width="70" align="center">
+        <el-table-column label="付款状态" width="70" align="center" fixed="left">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付</el-tag>
             <el-tag v-else type="info" size="small">未付</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="到货状态" width="70" align="center">
+        <el-table-column label="到货状态" width="70" align="center" fixed="left">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.单据状态==='3'" type="success" size="small">已到</el-tag>
             <el-tag v-else type="info" size="small">未到</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="表单号" align="center" min-width="200px">
+        <el-table-column label="表单号" align="center" min-width="200px" fixed="left">
           <template slot-scope="scope">
             {{ scope.row.表单号 }}
           </template>
@@ -171,26 +172,32 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="280px" fixed="right">
           <template slot-scope="scope">
-            <el-button
-              :disabled="scope.row.实际付款时间!==''"
-              size="mini"
-              type="primary"
-              plain
-              class="el-icon-check"
-              @click="editType1(scope.row, 'form');param = 0">到票</el-button>
-            <el-button
-              :disabled="scope.row.实际付款时间!==''"
-              size="mini"
-              type="primary"
-              plain
-              class="el-icon-edit"
-              @click="Withdrawing(scope.$index, scope.row, 'form2')">扣款</el-button>
-            <el-button
-              :disabled="scope.row.实际付款时间!==''||scope.row.单据状态!=='3'"
-              size="mini"
-              type="success"
-              class="el-icon-check"
-              @click="payment(scope.$index, scope.row)">付款</el-button>
+            <el-tooltip effect="dark" content="记录外协付款到票信息" placement="top" open-delay="1200">
+              <el-button
+                :disabled="scope.row.实际付款时间!==''"
+                size="mini"
+                type="primary"
+                plain
+                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-button
+                :disabled="scope.row.实际付款时间!==''"
+                size="mini"
+                type="primary"
+                plain
+                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-button
+                :disabled="scope.row.实际付款时间!==''||scope.row.单据状态!=='3'"
+                size="mini"
+                type="success"
+                class="el-icon-check"
+                @click="payment(scope.$index, scope.row)">付款</el-button>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -297,7 +304,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
+    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 764a6aac..2845e58d 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -337,9 +337,15 @@
       <div>
         <span>下调金额:（百分比）</span>
         <el-input v-model="money" size="small" clearable style="width:200px"/>
-        <el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>
-        <el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="confirmPrice">确定价格</el-button>
-        <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 15px" @click="Deal">成交</el-button>
+        <el-tooltip effect="dark" content="计算选入零件的价格" placement="top" open-delay="1200">
+          <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-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-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>
       </div>
     </el-card>
@@ -1615,9 +1621,6 @@ export default {
   .el-card{
     margin: 0px;
   }
-  span{
-    margin: 10px 0 10px 10px;
-  }
   td{
     width: 100px;
     height: 30px;
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index 5d30489c..f4f896cd 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -13,7 +13,9 @@
         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-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportTable('RWD')">导出外协加工任务单</el-button>
+      <el-tooltip effect="dark" content="打印外协采购单" placement="top" open-delay="1200">
+        <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportTable('RWD')">导出外协加工任务单</el-button>
+      </el-tooltip>
     </el-card>
 
     <el-card>
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 03d290be..bb9914c1 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -107,18 +107,18 @@
             <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
           </template>
         </el-table-column>
-        <el-table-column label="是否外协" width="750" align="center">
+        <el-table-column label="是否外协" width="120" 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>
           </template>
         </el-table-column>
-        <el-table-column label="工艺名称" align="center" min-width="120px">
+        <el-table-column label="工艺名称" align="center" width="120px">
           <template slot-scope="scope">
             {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="工艺要求" align="center" width="580px">
+        <el-table-column label="工艺要求" align="center" min-width="300">
           <template slot-scope="scope">
             <el-input v-model="scope.row.工艺要求" :autosize="{ minRows: 1, maxRows: 1}" size="mini" readonly type="textarea"/>
           </template>
@@ -378,6 +378,13 @@ export default {
   .el-card{
     margin:0px;
   }
+  .xujianwaix {
+    /*border: 1px solid red;*/
+    background: red;
+  }
+  .el-checkbox, .el-checkbox-button__inner {
+    color: blue;
+  }
 </style>
 <style>
   .el-table .waixie {
diff --git a/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue b/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue
index 20388d33..e0b38077 100644
--- a/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue
+++ b/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue
@@ -59,7 +59,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="120" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="Number(scope.row.是否关联)===1" size="mini" type="warning" plain @click="connectBacklog(scope.row)">关联物料</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="将滞货与项目关联并使用" placement="top">
+              <el-button :disabled="Number(scope.row.是否关联)===1" size="mini" type="warning" plain @click="connectBacklog(scope.row)">关联物料</el-button>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -109,7 +111,7 @@
       </el-table>
     </el-card>
 
-    <el-dialog :visible.sync="dialogVisible1" title="关联物料" center style="min-height: 300px;" width="900px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="关联物料" center style="min-height: 300px;" width="900px">
       <el-table :data="tableData01" size="mini" border style="width: 100%;" height="220" show-summary @selection-change="handleSelectionChange">
         <el-table-column type="selection" align="center" width="55"/>
         <el-table-column label="名称" align="center" min-width="100">
@@ -182,7 +184,7 @@ export default {
     ])
   },
   mounted() {
-    this.initData()
+    // this.initData()
     this.searchTable1()
   },
   methods: {
@@ -247,7 +249,6 @@ export default {
       }
       if (sum === Number(this.useNumber)) {
         submitConnectBacklog(this.useNum, materialLocalGroup, numGroup).then(response => {
-          console.log(response.data)
           if (response.data[0].result === '1') {
             this.$message.success('关联成功')
             this.searchTable1()
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 8a1d7031..925eb56f 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -391,7 +391,7 @@
       </el-col>
     </el-row>
 
-    <el-card style="margin-top: 15px">
+    <el-card>
       <div slot="header">
         <span>询价单号:</span>
         <el-input v-model="inquirySheetNum" placeholder="询价单号" size="small" clearable/>
@@ -408,11 +408,13 @@
           size="small"
           style="margin-left: 10px"
           @click="createInquirySheet">创建询价单</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          style="margin-left: 10px"
-          @click="addInquirySheet">选入</el-button>
+        <el-tooltip effect="dark" content="为选择的询价单添加物料" placement="top" open-delay="1000">
+          <el-button
+            type="warning"
+            size="small"
+            style="margin-left: 10px"
+            @click="addInquirySheet">选入物料</el-button>
+        </el-tooltip>
       </div>
       <h3 style="margin-top: 0;display:inline-block;width:50%">询价单</h3>
       <el-button :loading="baseInfoLoading" type="success" size="mini" style="float: right" @click="inquirySheetBaseInfoMaintain">询价单基础信息维护</el-button>
@@ -486,7 +488,9 @@
           @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-button :disabled="tableData3.length===0" type="success" size="mini" style="float: right" @click="saveOrder()">保存</el-button>
+        <el-tooltip effect="dark" content="保存该询价单" placement="top" open-delay="1000">
+          <el-button :disabled="tableData3.length===0" type="success" size="mini" style="float: right" @click="saveOrder()">保存</el-button>
+        </el-tooltip>
       </div><hr>
       <h3 style="margin-top: 0">询价单明细</h3>
       <el-table v-loading="" :data="tableData3" border style="max-height: 500px;" height="500px" size="mini">
@@ -547,7 +551,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="danger" size="mini" plain icon="el-icon-delete" @click="outInquirySheet(scope.row)">移出</el-button>
+            <el-tooltip effect="dark" content="将该物料从询价单中删除" placement="top" open-delay="1000">
+              <el-button type="danger" size="mini" plain icon="el-icon-delete" @click="outInquirySheet(scope.row)">移出</el-button>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -1941,7 +1947,7 @@ export default {
     text-align: center;
   }
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-select{
     width:200px
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 1f0569c1..e7690880 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">
+      <el-tooltip content="一键删除交货期" placement="right" open-delay="1000">
         <el-button type="danger" icon="el-icon-date" size="small" @click="deleteAllDate()"/>
       </el-tooltip>
       <span>①选择合同模板：</span>
@@ -176,7 +176,9 @@
       <!--<el-input v-model="actualTotal" size="small" style="width: 100px"/>-->
       <!--<el-button type="primary" size="small" @click="submitTotal()">确认</el-button>-->
       <span>②递交审批：</span>
-      <el-button type="success" size="small" @click="generateContract()">递交</el-button>
+      <el-tooltip effect="dark" content="核对信息后生成合同" placement="top" open-delay="1000">
+        <el-button type="success" size="small" @click="generateContract()">递交</el-button>
+      </el-tooltip>
       <hr>
       <!--html代码-->
       <div v-show="false">{{ content }}</div>
diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue
index cddacadd..2a4a471b 100644
--- a/src/views/PurchasingCenter/FundApproval1/index.vue
+++ b/src/views/PurchasingCenter/FundApproval1/index.vue
@@ -26,7 +26,7 @@
         <el-table-column label="审核" align="center" width="320">
           <template slot-scope="scope">
             <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData1" stripe size="mini" highlight-current-row show-summary @row-click="searchContactDetail">
+              <el-table :data="gridData1" class="subTableHeader" stripe size="mini" highlight-current-row show-summary @row-click="searchContactDetail">
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="采购合同编号">
                   <template slot-scope="scope">
@@ -39,10 +39,10 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
+              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable01(scope.row)">查看详情</el-button>
             </el-popover>
-            <el-button type="primary" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
+            <el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApproval(scope.row)">通过</el-button>
+            <el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApproval(scope.row)">不通过</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -365,7 +365,7 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-select{
     width:200px
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index 9fa62c05..a256aeef 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -166,7 +166,7 @@
       </el-table>
     </el-card>
 
-    <el-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="650px">
+    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="650px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="90px">
         <el-row>
           <el-col :span="12">
@@ -245,7 +245,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="900px">
+    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="900px">
       <span>供应商：</span>
       <el-input v-model="supplierName" size="small" placeholder="请选择供应商发票" style="margin: 0 5px 10px 0;" readonly/>
       <el-radio-group v-model="contractType" size="small" @change="searchTable01()">
@@ -680,7 +680,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 3f4517fe..00833d26 100644
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -108,7 +108,7 @@
             style="margin-left: 10px"
             @click="pageCurrent=1;searchMaterial()">查询
           </el-button>
-          <el-button :disabled="token !== 11 && token !== 36" type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
+          <el-button :disabled="token !== 11 && token !== 36" type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增</el-button>
           <el-button
             :disabled="token !== 11 && token !== 36"
             type="warning"
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index a857722c..4b9ca454 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -19,18 +19,22 @@
             icon="el-icon-search"
             style="margin-left: 10px"
             @click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
-          <el-button
-            type="primary"
-            size="small"
-            icon="el-icon-edit"
-            style="margin-left: 10px"
-            @click="changeInquiryStatus">变更询价状态</el-button>
-          <el-button
-            type="primary"
-            size="small"
-            icon="el-icon-menu"
-            style="margin-left: 10px"
-            @click="bindOfflineContract">绑定离线合同</el-button>
+          <el-tooltip effect="dark" content="更改选中的零件的询价状态" placement="top" open-delay="1000">
+            <el-button
+              type="primary"
+              size="small"
+              icon="el-icon-edit"
+              style="margin-left: 10px"
+              @click="changeInquiryStatus">变更询价状态</el-button>
+          </el-tooltip>
+          <el-tooltip effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top" open-delay="1000">
+            <el-button
+              type="warning"
+              size="small"
+              icon="el-icon-menu"
+              style="margin-left: 10px"
+              @click="bindOfflineContract">绑定离线合同</el-button>
+          </el-tooltip>
         </el-row>
       </div>
       <el-table
@@ -207,17 +211,17 @@
               {{ scope.row.供货商 }}
             </template>
           </el-table-column>
-          <el-table-column label="参考价格" min-width="150" align="center">
+          <el-table-column label="参考价格" min-width="100" align="center">
             <template slot-scope="scope">
               {{ scope.row.参考价格 }}
             </template>
           </el-table-column>
-          <el-table-column label="当前库存量" min-width="90" align="center">
+          <el-table-column label="当前库存量" min-width="70" align="center">
             <template slot-scope="scope">
               {{ scope.row.当前库存量 }}
             </template>
           </el-table-column>
-          <el-table-column label="安全库存量" min-width="200" align="center">
+          <el-table-column label="安全库存量" min-width="150" align="center">
             <template slot-scope="scope">
               <template v-if="scope.row.changeSafeValue">
                 <el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
@@ -226,16 +230,18 @@
               <span v-else>{{ scope.row.安全库存量 }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="设置" min-width="100" align="center">
+          <el-table-column label="设置" min-width="70" align="center">
             <template slot-scope="scope">
-              <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
-                type="warning"
-                size="mini"
-                plain
-                icon="el-icon-edit"
-                @click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
+              <el-tooltip effect="dark" content="设置安全库存量" placement="top" open-delay="1000">
+                <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
+                  type="warning"
+                  size="mini"
+                  plain
+                  icon="el-icon-edit"
+                  @click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
+              </el-tooltip>
             </template>
           </el-table-column>
         </el-table>
@@ -271,10 +277,10 @@
           style="margin-left: 10px"
           @click="addOfflineContract">创建离线合同</el-button>
         <el-button
-          type="primary"
+          type="warning"
           size="small"
           style="margin-left: 10px"
-          @click="addMateriel">选入</el-button>
+          @click="addMateriel">选入物料</el-button>
       </div>
       <el-table v-loading="" :data="tableData2" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable3">
         <el-table-column type="expand" fixed="left">
@@ -327,7 +333,10 @@
           <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-button type="warning" size="mini" plain @click="exportExcel(scope.row)">导出</el-button>
+            <el-tooltip effect="dark" content="导出合同" placement="top" open-delay="1000">
+              <el-button type="warning" size="mini" plain @click="exportExcel(scope.row)">导出</el-button>
+            </el-tooltip>
+
           </template>
         </el-table-column>
       </el-table>
@@ -341,7 +350,9 @@
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange2"
           @current-change="handleCurrentChange2"/>
-        <el-button :disabled="disable" type="success" size="mini" style="float:right;margin-left:10px" @click="doneOfflineContact">生成</el-button>
+        <el-tooltip effect="dark" content="生成合同" placement="top" open-delay="1000">
+          <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>
         <el-tooltip :content="hasTax" placement="top">
           <el-switch
@@ -442,7 +453,7 @@
       </el-table>
     </el-card>
 
-    <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px" width="700px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px" width="700px">
       <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
         <el-row>
           <el-col :span="12">
@@ -548,7 +559,7 @@
       </el-form>
     </el-dialog>
 
-    <el-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px">
+    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -606,7 +617,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogVisible0" title="绑定到离线合同" center style="min-height: 300px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible0" title="绑定到离线合同" center style="min-height: 300px">
       <el-table :data="tableData02" border show-summary height="300" size="mini">
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
@@ -1550,7 +1561,7 @@ export default {
     text-align: center;
   }
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 1px;
   }
   .el-date-editor{
     width:150px;
diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
index 609d247b..6c98f5ff 100644
--- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
@@ -560,7 +560,7 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-date-editor{
     width:150px;
diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index 23815ca2..c70b7be0 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -489,7 +489,7 @@ export default {
     margin: 0
   }
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-date-editor{
     width:150px;
diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
index 0fa35ef5..4fb479e2 100644
--- a/src/views/PurchasingCenter/PurchaseContractReview/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
@@ -29,8 +29,9 @@
         style="margin-left:10px"
         @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
       <el-button
-        type="primary"
+        type="warning"
         size="small"
+        plain
         icon="el-icon-search"
         style="margin-left:10px"
         @click="setting()">通知</el-button>
@@ -46,7 +47,7 @@
         height="300px"
         highlight-current-row
         @row-click="searchTable2">
-        <el-table-column type="expand">
+        <el-table-column type="expand" label="详情">
           <template slot-scope="scope">
             <el-form id="table" label-position="left" inline class="demo-table-expand">
               <el-row>
@@ -343,7 +344,7 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-date-editor{
     width:200px
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index 1477fa91..f381ba9d 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -60,11 +60,13 @@
             icon="el-icon-search"
             style="margin-left:10px"
             @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-          <el-button
-            type="warning"
-            size="small"
-            icon="el-icon-download"
-            @click="download()">导出</el-button>
+          <el-tooltip effect="dark" content="打印采购合同" placement="top" open-delay="1000">
+            <el-button
+              type="warning"
+              size="small"
+              icon="el-icon-download"
+              @click="download()">导出</el-button>
+          </el-tooltip>
         </el-row>
       </div>
       <el-table
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index a8d15013..2ef15195 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -30,7 +30,9 @@
         <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-button type="warning" size="small" icon="el-icon-download" style="margin-left: 15px" @click="exportDetail()">导出</el-button>
+        <el-tooltip effect="dark" content="将全部采购件导出到表格" placement="top" open-delay="1000">
+          <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 15px" @click="exportDetail()">导出</el-button>
+        </el-tooltip>
       </el-row>
     </el-card>
 
@@ -541,7 +543,7 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-select{
     width:200px
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 5812579b..8f6c996e 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -212,13 +212,15 @@
             </el-table-column>
             <el-table-column align="center" label="撤回分配" min-width="100px" fixed="right">
               <template slot-scope="scope">
-                <el-button
-                  :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
-                  type="primary"
-                  size="mini"
-                  plain=""
-                  icon="el-icon-back"
-                  @click="retract(scope.row)">撤回</el-button>
+                <el-tooltip effect="dark" content="撤回已分配的采购任务" placement="top" open-delay="1200">
+                  <el-button
+                    :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
+                    type="primary"
+                    size="mini"
+                    plain
+                    icon="el-icon-back"
+                    @click="retract(scope.row)">撤回</el-button>
+                </el-tooltip>
               </template>
             </el-table-column>
           </el-table>
@@ -1077,7 +1079,7 @@ export default {
     margin: 0
   }
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-select{
     width:200px
diff --git a/src/views/PurchasingCenter/SetPayPlan/index.vue b/src/views/PurchasingCenter/SetPayPlan/index.vue
index c2900696..f50827f9 100644
--- a/src/views/PurchasingCenter/SetPayPlan/index.vue
+++ b/src/views/PurchasingCenter/SetPayPlan/index.vue
@@ -105,7 +105,7 @@
 
     <div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
 
-    <el-dialog :visible.sync="dialogVisible1" title="增加付款计划" center style="min-height: 300px" width="400px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="增加付款计划" center style="min-height: 300px" width="400px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px">
         <el-form-item label="计划付款日期" prop="计划付款日期">
           <el-date-picker v-model="form1.计划付款日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue
index f65b9bf1..bccf5d5b 100644
--- a/src/views/PurchasingCenter/SupplierManagement/index.vue
+++ b/src/views/PurchasingCenter/SupplierManagement/index.vue
@@ -65,7 +65,7 @@
           </el-col>
           <el-col style="width: 250px;margin:2px 0 0 15px">
             <el-button type="success" size="small" icon="el-icon-search" @click="pageCurrent = 1;fetchData()">查询</el-button>
-            <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">增加</el-button>
+            <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增供应商</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -73,7 +73,7 @@
 
     <el-card>
       <div style="display: inline-block;margin-bottom: 20px">供应商列表</div>
-      <el-table :data="List" highlight-current-row border style="width: 100%;max-height: 600px;" height="600" size="mini" @row-click="rowClick">
+      <el-table :data="List" stripe highlight-current-row border style="width: 100%;max-height: 600px;" height="600" size="mini" @row-click="rowClick">
         <el-table-column label="供应商名称" align="center" fixed="left" min-width="250">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -154,8 +154,8 @@
     </el-card>
     <el-card>
       <div style="display: inline-block;margin-bottom: 20px;width:90%">供应商联系人列表</div>
-      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-bottom:10px;float:right" @click="handleAdd2()">增加</el-button>
-      <el-table :data="List1" border size="mini">
+      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-bottom:10px;float:right" @click="handleAdd2()">新增联系人</el-button>
+      <el-table :data="List1" border stripe size="mini">
         <el-table-column label="姓名" align="center">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
@@ -190,7 +190,7 @@
       </el-table>
     </el-card>
 
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
@@ -306,12 +306,12 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
-        <el-button v-show="title==='增加'" type="primary" @click="submitAdd('form')">确定</el-button>
+        <el-button v-show="title==='新增供应商'" type="primary" @click="submitAdd('form')">确定</el-button>
         <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog :title="title2" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="400px">
+    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="400px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="80px" class="demo-ruleForm">
         <el-form-item label="姓名" prop="姓名">
           <el-input v-model="form2.姓名" size="small" clearable/>
@@ -441,7 +441,7 @@ export default {
         this.$refs['form'].resetFields()
       }
       this.dialogFormVisible = true
-      this.title = '增加'
+      this.title = '新增供应商'
       this.form.供应商名称 = ''
       this.form.企业性质 = ''
       this.form.创立日期 = ''
@@ -643,7 +643,7 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-date-editor{
     width:200px
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index 7a69293e..e338bb96 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -1,50 +1,52 @@
 <template>
   <div class="app-container">
     <el-card v-loading="loading">
-      <div style="width: 650px;margin: 0 auto">
-        <div style="overflow: hidden">
-          <div style="margin-bottom: 10px;">
-            <span>项目：</span>
-            <el-select v-model="projectValue" filterable size="small" placeholder="项目名称" style="margin-top: 3px">
-              <el-option
-                v-for="item in project"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-            <span style="margin-left: 10px">类型：</span>
-            <el-select v-model="groupName" filterable size="small" placeholder="类型">
-              <el-option
-                v-for="item in Group"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-            <el-button type="primary" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
+      <el-col :span="6">
+        <el-steps :active="5" direction="vertical" style="height: 260px;margin-left: 50px">
+          <el-step title="选择项目"/>
+          <el-step title="选择类型"/>
+          <el-step title="浏览"/>
+          <el-step title="导入到数据库"/>
+          <el-step title="传递"/>
+        </el-steps>
+      </el-col>
+      <el-col :span="6">
+        <div style="width: 650px;margin: 0">
+          <div style="overflow: hidden">
+            <div style="margin-bottom: 10px;">
+              <span>项目：</span>
+              <el-select v-model="projectValue" filterable size="small" placeholder="项目名称" style="margin-top: 3px">
+                <el-option
+                  v-for="item in project"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <span style="margin-left: 10px">类型：</span>
+              <el-select v-model="groupName" filterable size="small" placeholder="类型">
+                <el-option
+                  v-for="item in Group"
+                  :key="item.value"
+                  :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>
+            <el-upload :on-remove="handleRemove" :file-list="itemFile" action=""/>
+          </div>
+          <div v-if="worksheet.length !== 0" style="float: right;margin: 3px 0">
+            <el-button :disabled="disabled" icon="el-icon-upload2" type="primary" size="small" @click="basicPartsToSQL">导入到数据库</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>
-          <el-upload :on-remove="handleRemove" :file-list="itemFile" action=""/>
-        </div>
-        <div v-if="worksheet.length !== 0" style="float: right;margin: 3px 0">
-          <el-button :disabled="disabled" icon="el-icon-upload2" type="primary" size="small" @click="basicPartsToSQL">导入到数据库</el-button>
-        </div>
-      </div>
+      </el-col>
     </el-card>
     <specification-data ref="specificationData" :groups-names="groupsNames" :machine-names="machineNames" :project-name="projectName" :group-name="groupName" @machineChange="machineChange"/>
-    <!--<el-upload-->
-    <!--class="upload-demo"-->
-    <!--drag-->
-    <!--action="http://localhost:8410/submit/uploadImg.ashx?InvoiceNum=1"-->
-    <!--multiple>-->
-    <!--<i class="el-icon-upload"/>-->
-    <!--<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>-->
-    <!--<div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
-    <!--</el-upload>-->
     <el-dialog
       v-el-drag-dialog
       :visible.sync="dialogVisibleMachine"
@@ -175,7 +177,6 @@ export default {
       this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false
       this.action = `${uploadFileMachine}?&MachineNum=${this.machineDrawValue}`
       this.getFileData(this.machineDrawValue)
-      console.log(this.action)
     },
     uploadSuccess(res, file, fileList) {
       if (res[0].result === '1') {
@@ -215,7 +216,6 @@ export default {
     },
     async test() {
       await sleep(10000)
-      console.log(1)
     },
     fetchData() {
       this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
@@ -243,7 +243,6 @@ export default {
     },
     async selected(data) { // 选择需要导入的文件
       this.worksheet = data.worksheet // 获取每个多选文件的表格坐标及值
-      console.log(this.worksheet)
       this.itemFile = data.itemFile
     },
     handleRemove(file) { // 移除文件
@@ -341,14 +340,12 @@ export default {
               this.group = this.worksheet[j].M2.v.substring(0, this.worksheet[j].M2.v.indexOf('-')) + '组'
               const response = await isExit1(this.projectValue, this.worksheet[j].F2.v, this.group)
               const res = response.data
-              console.log(res, 1111)
               if (res[0].Column1 === 0) {
                 this.$notify.error(`${this.group}组件不存在，请确认文件是否正确`)
                 this.loading = false
                 this.disabled = false
                 return
               } else {
-                console.log(this.worksheet[j], 111111111)
                 if (this.worksheet[j].M2.v.substring(0, 1) !== '9') {
                   this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
                   this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''
@@ -401,7 +398,6 @@ export default {
         this.loading = false
         this.projectChange(this.projectName) // 调用查询机床方法，通过watch属性检测变化会自动得到下面表格的值。
       } catch (e) {
-        console.log(e)
         this.err++
         this.loading = false
         this.$notify.error(`导入数据错误,请检查导入文件是否正确`)
@@ -410,11 +406,9 @@ export default {
     },
     async insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) {
       try {
-        console.log(useNum, 232)
         if (groupNum.indexOf('MX') > -1) {
           const response = await importBasics(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, this.group, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
           const res = response.data
-          console.log(res, 11111111)
           if (res.hasOwnProperty('output') === false) {
             if (res[0].result === '0') {
               this.$notify.error(`${drawingNum}导入失败`)
@@ -428,10 +422,8 @@ export default {
             }
           }
         } else {
-          console.log(drawingNum, 1111111111)
           const response = await importPurcharse(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, this.group, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
           const res = response.data
-          console.log(res, 222222)
           if (res.hasOwnProperty('output') === false) {
             if (res[0].result === '0') {
               this.$notify.error(`${drawingNum}导入失败`)
@@ -446,7 +438,6 @@ export default {
           }
         }
       } catch (e) {
-        console.log('哈哈哈哈')
         this.err++
         this.$message.error(`导入数据错误`)
         console.log(`导入数据错误${e}`)
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index 6618dd9e..3049d747 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -18,7 +18,9 @@
             :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-tooltip content="asdsdr" 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-row style="margin-top: 5px;margin-bottom: 3px">
           <span>机床名称：</span>
@@ -403,7 +405,6 @@ export default {
         const projectCheck = this.projectName ? 1 : 0
         const machineCheck = this.machineValue ? 1 : 0
         const groupCheck = this.groupValue ? 1 : 0
-        console.log(this.groupName, 123)
         if (this.groupName.indexOf('MX') > -1) { // 当分组为基本件时，查询基本件规范和不规范数据，否则查询外购件或标准件规范和不规范数据
           // 分别查出规范和不规范数据，将规范数据放前面在一个总数组中
           this.type = 1
@@ -418,7 +419,6 @@ export default {
         } else {
           this.type = 2
           this.unSpecification = await unSpecificationQueryWB(projectCheck, this.projectName, machineCheck, this.machineValue, groupCheck, this.groupValue)
-          console.log(this.unSpecification)
           this.unSpecification.data.forEach(item => {
             this.tableDataAll.push(item)
           })
@@ -462,9 +462,7 @@ export default {
       })
     },
     getMachineNames() {
-      console.log(this.machineValue, 2222)
       getMachineNames(this.machineValue).then(response => {
-        console.log(response.data, 3333)
         this.machineName = response.data[0].机床名称
         this.machineNum = response.data[0].机床数量
       })
@@ -518,10 +516,8 @@ export default {
       }
     },
     searchMaterial1(row) {
-      console.log(row)
       searchMaterial1(row.图号或者型号, row.名称, row.规格).then(response => {
         this.tableData10 = response.data
-        console.log(response.data)
       })
     },
     getMaterialWB() {
@@ -553,11 +549,9 @@ export default {
         this.err = 0
         if (this.groupValue) {
           this.listLoading = true
-          console.log(this.groupName, 123)
           if (this.groupName.indexOf('MX') > -1) {
             for (let i = 0; i < this.tableDataAll.length; i++) {
               const data = this.tableDataAll[i]
-              console.log(data)
               if (this.groupValue.indexOf('00') > -1) {
                 const index = data.图号或者型号.lastIndexOf('-')
                 data.图号或者型号 = data.图号或者型号.substring(index + 1)
@@ -570,7 +564,6 @@ export default {
                   }
                 }
               } else {
-                console.log(222222222)
                 const total = parseInt(data.备件数量) + parseFloat(data.装机数量) * parseInt(data.部件数量)
                 const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量)
                 await sleep(10)
@@ -598,7 +591,6 @@ export default {
             }
           }
           if (this.err === 0) { // 传递成功后，清除该分组。当所有组都传递完成后，该项目下的机床和分组消失
-            console.log(this.groupsNames.indexOf(this.groupValue), 22222)
             // const index = this.groupsNames.indexOf(this.groupValue)
             // this.groupsNames.splice(index, 1)
             if (this.groupsNames.length === 0) {
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index ded8ec0d..0679cf94 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -44,6 +44,7 @@
       </div>
     </el-card>
     <el-card>
+      <h3>自制件</h3>
       <el-table
         v-loading="loading"
         :data="tableData"
@@ -157,6 +158,7 @@
       </div>
     </el-card>
     <el-card>
+      <h3>外购件</h3>
       <el-table
         v-loading="loadingWB"
         :data="tableDataWB"
@@ -445,16 +447,16 @@ export default {
 </script>
 
 <style scoped>
-/*span{*/
-  /*margin: 20px;*/
-/*}*/
+span{
+  margin: 0px;
+}
 .wrapper{
   width: 225px;
   height: 50px;
   overflow: hidden;
   border: 1px solid #b8c7d9;
   float: left;
-  margin: 10px;
+  margin: 0px;
 }
 .content{
   position: relative;
@@ -493,4 +495,8 @@ a{
   display: inline-block;
   color: #999;
 }
+.el-card {
+   padding: 0px !important;
+   margin: 0px !important;
+}
 </style>
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index 80f3eb47..d7df3f20 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -167,9 +167,8 @@
         </el-table-column>
       </el-table>
       <el-button
-        type="primary"
+        type="shengcheng"
         size="small"
-        icon=""
         style="margin-top:10px"
         @click="calculateContractSum">计算合同总额</el-button>
       <span>合同总额(未税):</span>
@@ -187,14 +186,13 @@
           :value="item.value"/>
       </el-select>
       <el-button
-        type="primary"
+        type="shengcheng"
         size="small"
-        icon=""
         style="margin-left: 7.5%; margin-top: 10px"
         @click="doneContract">生成采购合同</el-button>
     </el-card>
 
-    <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
       <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
         <el-row>
           <el-col :span="12">
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index b71b9431..d1ac5986 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -28,9 +28,15 @@
       <el-col style="margin-left: 0px">
         <span>零件图号:</span>
         <el-input v-model="partDrawingNumber" placeholder="零件图号" size="small" clearable style="margin: 3px 0"/>
-        <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-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入物料</el-button>
-        <el-button type="danger" size="small" icon="el-icon-download" style="margin-left: 10px" @click="back">打回</el-button>
+        <el-tooltip effect="dark" content="查询备料零件" placement="top" open-delay="1200">
+          <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-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-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">
           <el-table-column type="selection" align="center" width="55"/>
           <el-table-column label="零件图号" min-width="100" align="center">
@@ -73,11 +79,15 @@
         <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-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 effect="dark" content="查询采购单" placement="top" open-delay="1200">
+          <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-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存</el-button>
+        <el-tooltip effect="dark" content="保存选中的采购单" placement="top" open-delay="1200">
+          <el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存</el-button>
+        </el-tooltip>
       </div>
-      <el-table v-loading="" :data="tableData2" border stripe h style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3">
+      <el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3">
         <el-table-column label="单号状态" align="center" width="100" fixed="left">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</el-tag>
@@ -127,7 +137,7 @@
                 <el-button :disabled="parseInt(scope.row.采购计划状态)===2" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
               </div>
             </el-tooltip>
-            <el-tooltip effect="dark" content="导出" placement="top">
+            <el-tooltip effect="dark" content="导出打印采购计划" placement="top">
               <div style="display: inline-block">
                 <el-button type="text" size="mini" icon="el-icon-download" style="margin-left: 20px" @click="exportExcel(scope.row)"/>
               </div>
diff --git a/src/views/WorkshopProcurement/OfflineContract1/index.vue b/src/views/WorkshopProcurement/OfflineContract1/index.vue
index 61aa7329..652262cc 100644
--- a/src/views/WorkshopProcurement/OfflineContract1/index.vue
+++ b/src/views/WorkshopProcurement/OfflineContract1/index.vue
@@ -124,7 +124,7 @@
           style="margin-left: 10px"
           @click="addOfflineContract">创建离线合同</el-button>
         <el-button
-          type="primary"
+          type="shengcheng"
           size="small"
           icon="el-icon-download"
           style="margin-left: 10px"
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index cf4057b5..d1de84a1 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -21,12 +21,14 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button
-        type="success"
-        size="small"
-        icon="el-icon-search"
-        style="margin-left: 10px"
-        @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      <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="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      </el-tooltip>
       <el-button
         type="primary"
         size="small"
diff --git a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue
index f00eb34b..38191a6b 100644
--- a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue
@@ -12,12 +12,14 @@
         </el-select>
         <span style="margin-left: 10px">供应商:</span>
         <el-input v-model="supplierName0" placeholder="供应商" style="width: 200px" size="small" clearable/>
-        <el-button
-          type="success"
-          size="small"
-          icon="el-icon-search"
-          style="margin-left: 10px"
-          @click="pageCurrent=1;pageSize=10;total=0;searchTable()">查询</el-button>
+        <el-tooltip effect="dark" content="查询外购件到货信息" placement="top" open-delay="1200">
+          <el-button
+            type="success"
+            size="small"
+            icon="el-icon-search"
+            style="margin-left: 10px"
+            @click="pageCurrent=1;pageSize=10;total=0;searchTable()">查询</el-button>
+        </el-tooltip>
       </div>
       <el-table
         v-loading="loading"
@@ -137,9 +139,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="70">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="到货" placement="top">
+            <el-tooltip effect="dark" content="输入到货信息" placement="top" open-delay="1200">
               <div style="display: inline-block">
-                <el-button type="text" size="mini" icon="el-icon-goods" @click="OpenArrival(scope.row)"/>
+                <el-button el-button type="success" size="mini" icon="el-icon-goods" plain @click="OpenArrival(scope.row)">到货</el-button>
               </div>
             </el-tooltip>
           </template>
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 6ac8877e..5f85bb5e 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -16,13 +16,17 @@
         end-placeholder="结束日期"/>
       <span style="margin-left: 10px">供应商:</span>
       <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
-      <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-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
+      <el-tooltip :open-delay="1000" 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 :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
+        <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
+      </el-tooltip>
     </el-card>
 
     <el-card>