chris 2 жил өмнө
parent
commit
2ef52d95a5

+ 6 - 4
src/views/modules/warehouse/inventory.vue

@@ -150,6 +150,7 @@
   import Detail from './inventory-detail'
   import {getInventoryList} from '@/api/warehouse'
   import PreviewComponent from '@/views/modules/common/preview-component'
+
   export default {
     name: 'stock-order',
     components: {PreviewComponent, inventoryAdd, inventoryBegin, Detail},
@@ -270,6 +271,7 @@
           this.$refs.detail.init(id)
         })
       },
+      // 导出文件
       exportExcel (inventoryId) {
         this.$http({
           url: this.$http.adornUrl('/biz-service/inventory-checking-ctl/exportExcel'),
@@ -282,7 +284,7 @@
           if (!data) {
             return
           }
-          let url = window.URL.createObjectURL(new Blob([data]))
+          const url = window.URL.createObjectURL(new Blob([data]))
           let a = document.createElement('a')
           let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]
           a.style.display = 'none'
@@ -294,14 +296,14 @@
           document.body.removeChild(a)
         }).catch((error) => { console.log(error) })
       },
-      // 上传文件
+      // 导入文件
       importExcel () {
         this.$refs.fileRef.dispatchEvent(new MouseEvent('click'))
       },
       fileChange (e) {
         const file = e.target.files[0]
         const formData = new FormData()
-        formData.append('importFile', file.raw)
+        formData.append('file', file)
         this.$http({
           url: this.$http.adornUrl('/biz-service/inventory-checking-ctl/importExcel'),
           method: 'post',
@@ -312,7 +314,7 @@
           } else {
             this.$message.error('上传失败')
           }
-        })
+        }).catch((e) => { console.log(e) })
       }
     }
   }