3.0.36 更新云打印

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.33",
+  "version": "3.0.36",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

src/print/PrintCard.vue

@@ -398,7 +398,7 @@ const printCard = async data => {
       let base64 = await getBase64(rows[key], tempStr, rows[key].assetNo);
       let file = base64toFile(base64, rows[key].id);
       formData.append('file', file);
-      propText.value = `打印中,已打印${amount}张`;
+      propText.value = `生成中,已生成${amount}张`;
     }
     multipleImageUpload(formData).then(
       successData => {
@@ -443,13 +443,30 @@ const downloadImageZip = () => {
     message.warning('请选择导入批次');
   } else {
     globalLoading.value = true;
-    let params = { batchNo: queryParams.batchNo };
-    downloadZip(params).then(successData => {
-      const downloadUrl = `/api/LabelPrintResource/batchImageDownload?batchNo=${queryParams.batchNo}`;
-      window.open(downloadUrl);
-      message.success('下载成功');
-      globalLoading.value = false;
-    });
+    var xhr = new XMLHttpRequest();
+    xhr.open('get', `api/LabelPrintResource/batchImageDownload?batchNo=${queryParams.batchNo}`, true);
+    const token = localStorage.getItem('#token');
+    xhr.setRequestHeader('token', token);
+    xhr.setRequestHeader('Content-type', 'application/json');
+    xhr.responseType = 'blob';
+    xhr.onreadystatechange = function(){
+      if(xhr.readyState === 4 && xhr.status === 200){
+        let res = xhr.response;
+        let blob = new Blob([res]);   
+        const blobUrl = URL.createObjectURL(blob);
+        const link = document.createElement('a');
+        link.download = '图片.zip';
+        link.style.display = 'none';
+        link.href = blobUrl;
+        document.body.appendChild(link);
+        link.click();
+        URL.revokeObjectURL(blobUrl);
+        document.body.removeChild(link);  
+        globalLoading.value = false;
+        message.success('下载成功');
+      }
+    };
+    xhr.send();
   }
 };