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/styles/index.scss b/src/styles/index.scss
index c8385a27..40584490 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -232,7 +232,7 @@ el-card{
 }
 
 h3 {
-  height: 10px !important;
+  height: 20px !important;
   margin: 0px !important;
 }
 .el-table__footer {
diff --git a/src/utils/request.js b/src/utils/request.js
index 8ff60856..4660b16b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,7 +23,11 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
+<<<<<<< HEAD
   baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
+=======
+  baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`,
+>>>>>>> f8c7e9afc36e00f5106add1477d9f258dbe37ec6
   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/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/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/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/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index 931821e2..d31cc62e 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -84,7 +84,7 @@
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
             <el-button v-if="scope.row.changeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" icon="el-icon-edit" size="mini" @click="scope.row.changeValue=!scope.row.changeValue">编辑</el-button>
+            <el-button v-else type="primary" icon="el-icon-edit" size="mini" plain @click="scope.row.changeValue=!scope.row.changeValue">编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -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..04b0cdbd 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -49,7 +49,7 @@
               plain
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
-            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">新增货位</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -91,11 +91,13 @@
             <el-button
               size="mini"
               icon="el-icon-edit"
-              type="primary"
+              plain
+              type="warning"
               @click="handleLocateEdit(scope.row)">修改</el-button>
             <el-button
               size="mini"
               type="danger"
+              plain
               icon="el-icon-delete"
               @click="locateDelete(scope.row)">删除</el-button>
           </template>
@@ -103,7 +105,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 +182,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..e721d1db 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="primary" @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/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 2d06b88f..787ed697 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-col :span="12">
+      <el-col style="width: 530px">
         <el-form label-width="270px" label-position="right" class="Time">
           <el-form-item v-show="false">
             <el-radio-group v-model="radio" size="small">
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index 0bdbc836..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
@@ -65,13 +64,13 @@
         <el-table-column
           type="selection"
           align="center"
-          width="35"/>
-        <el-table-column label="零件图号" align="center" width="300">
+          width="50"/>
+        <el-table-column label="零件图号" align="center" width="200">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" align="center" width="200">
+        <el-table-column label="零件名称" align="center" width="300">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -733,7 +732,6 @@ export default {
     this.getTable()
   },
   methods: {
-    asd() {},
     // TABLE每行颜色
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex === 1) {
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index f23c13af..a5f25df9 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -87,7 +87,7 @@
         size="small"
         value-format="yyyy-MM-dd"
         placeholder="选择日期"/>
-      <el-tooltip effect="dark" content="设定设备参数有效时间" placement="top">
+      <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/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 95c955b9..936c2c4d 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -304,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/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 1b3137ba..e20a6023 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="primary" @click="connectBacklog(scope.row)">关联物料</el-button>
+            <el-tooltip effect="dark" content="将滞货与项目关联并使用" placement="top" open-delay="1200">
+              <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>
diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index b1219bbf..a413421e 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -17,7 +17,7 @@
           end-placeholder="结束日期"/>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable0()">查询</el-button>
       </div>
-      <h3 style="margin-top: 0">付款计划</h3>
+      <h3>付款计划</h3>
       <el-table :data="tableData0" size="mini" border style="max-height: 250px;" height="250px" highlight-current-row @row-click="searchContract">
         <el-table-column label="计划状态" width="100" align="center">
           <template slot-scope="scope">
@@ -84,7 +84,7 @@
           <el-input v-show="supplierValue" v-model="totalDebt" size="mini" style="width: 100px;" readonly/>
         </div>
       </div>
-      <h3 style="margin-top: 0">请款表</h3>
+      <h3>请款表</h3>
       <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini">
         <el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
index 0fa35ef5..1a58c415 100644
--- a/src/views/PurchasingCenter/PurchaseContractReview/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
@@ -46,7 +46,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>
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 5812579b..51f39929 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>
diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue
index f65b9bf1..9da66eda 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.创立日期 = ''
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/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 3d9eea89..bdcb9800 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -105,7 +105,7 @@
             {{ scope.row.采购单名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="250">
+        <el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 20eda05b..ea78d41f 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -53,7 +53,7 @@
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="250">
+        <el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -99,7 +99,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="250">
+        <el-table-column label="操作" align="center" width="150">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="取消请款" placement="top">
               <div style="display: inline-block">