From 77b603829628c942b54c00fb791e5e449ce60f44 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Tue, 24 Sep 2019 17:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssemblyQualityInspection/index.vue       |  6 ++-
 .../index.vue                                 | 10 ++--
 .../PartsNumberMaintenance/index.vue          | 48 ++++++++++++-------
 src/views/BasicData/ShiftManagement/index.vue | 43 +++++++++--------
 .../SystemRrolemaintenance/index.vue          | 11 +++--
 .../WorkshopPersonnelRoleMana/index.vue       | 31 +++++++-----
 .../PurchaseContractReview/index.vue          |  3 +-
 .../PurchaseContractSearch/index.vue          | 12 +++--
 .../TechnologyCenter/QueryParts/index.vue     | 14 ++++--
 9 files changed, 107 insertions(+), 71 deletions(-)

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/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/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/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
index 606186ca..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="info"
+        type="warning"
         size="small"
+        plain
         icon="el-icon-search"
         style="margin-left:10px"
         @click="setting()">通知</el-button>
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/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>