Merge remote-tracking branch 'origin/project2024-3-5' into project2024-3-5

# Conflicts:
#	src/views/equipment/inventoryManagement/index.vue

src/api/magnagement.js

@@ -63,6 +63,16 @@ export function uploadFalseFile(params) {
   })
 }
 
+// 下载用户导入模板
+export function importTemplate(params) {
+  return request({
+    url: '/wbwarehouse-test/importTemplate',
+    method: 'get',
+    responseType: 'blob',
+    params
+  })
+}
+
 // 查询设备列表
 export function listdevice(query) {
   return request({

src/views/equipment/inventoryManagement/index.vue

@@ -235,7 +235,8 @@ import {
   updatadevice_t,
   exportWarehouse,
   importExcel,
-  uploadFalseFile
+  uploadFalseFile,
+  importTemplate
 } from '@/api/magnagement'
 import { resetForm } from '@/utils/common'
 
@@ -451,6 +452,21 @@ export default {
       this.upload.title = '库存信息导入'
       this.upload.open = true
     },
+    /** 下载模板操作 */
+    importTemplate() {
+      importTemplate().then(response => {
+        const blob = new Blob([response])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob)// 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = '库存导入模板' + '.xls' // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click()// 点击下载
+        document.body.removeChild(downloadElement)// 下载完成移除元素
+        window.URL.revokeObjectURL(href)// 释放掉blob对象
+        // this.download(response.msg);
+      })
+    },
 
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -496,7 +512,6 @@ export default {
                 downloadElement.click() // 点击下载
                 document.body.removeChild(downloadElement) // 下载完成移除元素
                 window.URL.revokeObjectURL(href) // 释放掉blob对象
-                // 导入成功后关闭弹出框
                 this.importLoading = false
                 this.upload.open = false
               })

src/views/system/user/index.vue

@@ -840,6 +840,7 @@ export default {
           downloadElement.click()// 点击下载
           document.body.removeChild(downloadElement)// 下载完成移除元素
           window.URL.revokeObjectURL(href)// 释放掉blob对象
+          // this.download(response.msg);
         })
       })
     },