Merge branch 'dev' into 'master'

feat: 批次素材下载改为直接下载而非新窗口打开

See merge request !205

src/views/order/factoryOrderNew/component/BatchManageTable.vue

@@ -487,7 +487,16 @@ const handleDownload = async (row: BatchManageData) => {
   try {
     const res = await downloadBatchMaterialApi(row.id, type)
     if (res.code !== 200) return
+    if (type === 'tiff') {
       window.open(filePath + res.message, '_blank')
+    } else {
+      const a = document.createElement('a')
+      a.href = filePath + res.message
+      a.download = res.message?.split('/').pop() || 'download'
+      document.body.appendChild(a)
+      a.click()
+      document.body.removeChild(a)
+    }
   } catch (e) {
     console.error(e)
   } finally {