From bbaa7740f3bda10e3b6ed8b5cb0dc4f8f682e8b8 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 9 Mar 2020 16:45:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Inventory/PurchaseOutRecord/index.vue     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue
index dfdb79a7..0a3af739 100644
--- a/src/views/Inventory/PurchaseOutRecord/index.vue
+++ b/src/views/Inventory/PurchaseOutRecord/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 950px;margin: 0px 0px 5px 0px">
+    <el-card style="width: 1000px;margin: 0px 0px 5px 0px">
       <el-row style="margin-bottom:10px;margin-top: 10px">
         <el-select v-model="machineValue" filterable placeholder="机床图号" size="small" clearable style="width: 180px" @change="machineChange">
           <el-option
@@ -33,7 +33,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"/>
         <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 20px" plain @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
-        <el-button type="success" icon="el-icon-bottom" plain size="small" style="margin-left: 15px" @click="exportExcel()">导出</el-button>
+        <el-button :loading="loading_export" type="success" icon="el-icon-bottom" plain size="small" style="margin-left: 15px" @click="exportExcel()">导出</el-button>
       </el-row>
       <el-row v-show="false" style="margin-bottom:10px">
         <el-date-picker
@@ -48,7 +48,7 @@
           end-placeholder="结束时间"/>
       </el-row>
     </el-card>
-    <el-card style="width: 950px">
+    <el-card style="width: 1000px">
       <el-table :data="tableData" border stripe size="mini" height="700">
         <el-table-column label="名称" align="center" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -75,7 +75,7 @@
             {{ scope.row.领料人 }}
           </template>
         </el-table-column>
-        <el-table-column label="出库时间" align="center" width="90">
+        <el-table-column label="出库时间" align="center" min-width="90">
           <template slot-scope="scope">
             {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
           </template>
@@ -102,6 +102,7 @@ export default {
   name: 'PurchaseOutRecord',
   data() {
     return {
+      loading_export: false,
       projectValue: '', // 项目名称
       project: [],
       machineValue: '',
@@ -132,7 +133,8 @@ export default {
   methods: {
     // EXCEL 导出
     // 姜福壮
-    exportExcel() {
+    async exportExcel() {
+      this.loading_export = true
       let check1, check2, check3, check4, check5, check6, check7
       this.projectValue ? check1 = 1 : check1 = 0
       this.machineValue ? check2 = 1 : check2 = 0
@@ -157,8 +159,11 @@ export default {
       param[12] = ['出库时间_check', check7]
       param[13] = ['出库开始时间', this.outTime[0]]
       param[14] = ['出库结束时间', this.outTime[1]]
-      var Data = this.CreateData('00', '报表_采购部仓库_出库记录_查询', param)
-      this.exportExcel_NPOI(Data)
+      var Data = this.CreateData('2001', '报表_采购部仓库_出库记录_查询', param)
+      await this.exportExcel_NPOI(Data)
+      setTimeout(() => {
+        this.loading_export = false
+      }, 5000)
     },
     fetchData() {
       initMachineProject().then(response => {