From f7a4975c0a105c382b0f6fea7d78688aa196eb95 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 24 Sep 2019 14:37:03 +0800
Subject: [PATCH] a

---
 src/views/Inventory/Inboundscanning/index.vue        |  2 +-
 src/views/Inventory/OutPartSelect/index.vue          |  2 +-
 src/views/Inventory/StockInquiry/index.vue           |  2 +-
 .../ActualTimeSupplement/index.vue                   |  2 +-
 .../MachiningSequenceAdjustment/index.vue            |  2 +-
 .../ManufacturingCenter/ProcessingStatus/index.vue   | 10 ++++++----
 .../ProcessingStatusEdit/index.vue                   |  2 +-
 src/views/ManufacturingCenter/StatusQuery/index.vue  | 12 ++++++------
 .../machiningHoursStatistics/index.vue               |  8 ++++----
 .../OutsourcingMaterialsInvoice/index.vue            |  2 +-
 .../RequestOutsourcingMaterials/index.vue            |  4 ++--
 11 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index 4c64d609..5befe324 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -18,7 +18,7 @@
       <el-table
         v-loading="listLoading"
         :data="tableDataNum"
-        stripe="true"
+        stripe
         highlight-current-row
         border
         size="mini"
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 50e4d14f..6178a82c 100644
--- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
+++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
@@ -52,7 +52,7 @@
     <el-card>
       <el-table
         :data="tableData"
-        :stripe="true"
+        stripe
         height="550"
         size="mini"
         highlight-current-row
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index e50dfeba..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
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 b258f8e0..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
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/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index 7835b8dc..8a37c23e 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -32,7 +32,7 @@
           highlight-current-row
           height="380"
           size="mini"
-          stripe="true"
+          stripe
           style="width: 100%;"
           border
           element-loading-text="拼命加载中"
@@ -65,7 +65,7 @@
         </div>
       </el-col>
       <el-col :span="17" style="margin-left: 30px;">
-        <el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe="true" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+        <el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
           <el-table-column label="零件图号" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
@@ -131,7 +131,7 @@
     </el-card>
     <el-card>
       <el-col :span="6">
-        <el-table v-loading="loading3" :data="tableData3" stripe="true" size="mini" highlight-current-row height="380" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
+        <el-table v-loading="loading3" :data="tableData3" stripe size="mini" highlight-current-row height="380" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
           <el-table-column label="机床编号" align="center" width="110px">
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
@@ -160,7 +160,7 @@
         </div>
       </el-col>
       <el-col :span="17" style="margin-left: 30px;">
-        <el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe="true" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+        <el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
           <el-table-column label="机床编号" align="center">
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index b4fc21f2..d1de84a1 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -21,7 +21,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-tooltip effect="dark" content="查询外购备料发货信息" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发货信息" placement="top">
         <el-button
           type="success"
           size="small"
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index ea78d41f..5f85bb5e 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -16,7 +16,7 @@
         end-placeholder="结束日期"/>
       <span style="margin-left: 10px">供应商:</span>
       <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
-      <el-tooltip effect="dark" content="查询外购备料清款信息" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
         <el-button
           type="success"
           size="small"
@@ -24,7 +24,7 @@
           style="margin-left: 10px"
           @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
       </el-tooltip>
-      <el-tooltip effect="dark" content="对选择的请款任务创建请款申请" placement="top" open-delay="1200">
+      <el-tooltip :open-delay="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>