From 53103cec64344c2c3fe69467beb7a3bcc5ff50c8 Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Mon, 18 Jul 2022 14:44:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=20=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outInStorage/inStorage/index.vue              | 11 ++++++++---
 .../outInStorage/outInHistory/index.vue           | 15 ++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue
index 57b6aa3..dfdeb14 100644
--- a/src/views/archivesManage/outInStorage/inStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/index.vue
@@ -112,7 +112,6 @@ export default {
     return CRUD({
       url: 'api/storage/readyInto',
       // crudMethod: caseCrudMethod,
-      title: '档案盒',
       optShow: {}
     })
   },
@@ -133,12 +132,18 @@ export default {
       child: []
     }
   },
+  created() {
+    this.getData()
+  },
   methods: {
+    getData() {
+      console.log(this.crud, 'crud')
+    },
     // 单元格样式
     cell({ row, columnIndex }) {
-      if (row.storageType === 0 && columnIndex === 2) {
+      if (row.storageType === 0 && columnIndex === 2) { // 未入
         return 'fail-clear'
-      } else if (row.storageType === 1 && columnIndex === 2) {
+      } else if (row.storageType === 1 && columnIndex === 2) { // 待入
         return 'no-clear'
       }
     },
diff --git a/src/views/archivesManage/outInStorage/outInHistory/index.vue b/src/views/archivesManage/outInStorage/outInHistory/index.vue
index 440d7ad..57fe36b 100644
--- a/src/views/archivesManage/outInStorage/outInHistory/index.vue
+++ b/src/views/archivesManage/outInStorage/outInHistory/index.vue
@@ -1,7 +1,8 @@
 <template>
   <div>
     <div class="head-container">
-      <crudOperation />
+      <!-- <crudOperation /> -->
+      <el-button v-permission="permission.download" :loading="crud.downloadLoading" size="mini" icon="el-icon-download" @click="handleExport">导出</el-button>
       <el-select v-model="storageType" class="filter-item" style="width: 100px; height: 30px;margin:0 0 0 10px" @change="crud.toQuery">
         <el-option v-for="item in storageTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
@@ -68,11 +69,13 @@
 import rrOperation from '@crud/RR.operation'
 import CRUD, { presenter, crud } from '@crud/crud'
 import pagination from '@crud/Pagination'
-import crudOperation from '@crud/CRUD.operation'
+// import crudOperation from '@crud/CRUD.operation'
+import { exportFile } from '@/utils/index'
 
+// exportFile内容
 export default {
   name: 'OutInHistory',
-  components: { rrOperation, pagination, crudOperation },
+  components: { rrOperation, pagination },
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({
@@ -148,6 +151,12 @@ export default {
       } else if (row.storageType === 3 && columnIndex === 2) { // 待出
         return 'other-clear'
       }
+    },
+    // 导出
+    handleExport() {
+      this.crud.downloadLoading = true
+      exportFile(this.baseApi + '/api/storage/exportStorageLogList')
+      this.crud.downloadLoading = false
     }
   }
 }