jufubao-admin-library 1.1.140 → 1.1.142

package/library/viewModules/viewTask/viewTask/list.vue

@@ -37,7 +37,7 @@
             <el-button
               type="primary"
               size="small"
-              @click="handleOperate(item.action,scope.row.serial_no,scope.row.download_url)"
+              @click="handleOperate(item.action,scope.row.serial_no,scope.row.download_url, scope.row)"
               v-for="(item,index) in scope.row.buttons"
               :key="index"
             >{{item.title}}</el-button>
@@ -54,6 +54,7 @@
         ></xd-pagination>
       </div>
     </el-card>
+    <iframe id="download-url" style="display: none"></iframe>
   </div>
 </template>
 
@@ -296,10 +297,10 @@ export default {
     /**
      *按钮操作
      **/
-    handleOperate (action, serial_no, url) {
+    handleOperate (action, serial_no, url , {file_name,file_ext }) {
       if (action === 'retry') {
         //重新执行
-        this.asyncRetry({ 
+        this.asyncRetry({
           serial_no: serial_no,
           // #ifdef open-dist
           app_id:xdCookie.get('app_value'),
@@ -315,20 +316,28 @@ export default {
             console.log(err, 'err')
           })
 
-      } else if (action === 'download') {
+      }
+      else if (action === 'download') {
         let loading = this.$loading({})
         this.getDownloadUrl({serial_no})
           .then(res=>{
+            let download_url = ''
             //#ifdef partner-site
-            if(res.download_url) {
-              window.open(res.download_url)
+            if(res['download_url']) {
+              download_url = res['download_url']
             }
             // #endif
             //#ifndef partner-site
-            if(res.data.download_url) {
-              window.open(res.data.download_url)
+            if(res.data['download_url']) {
+              download_url = res.data['download_url']
             }
             // #endif
+            let fileName = '';
+            if(file_name && file_ext) fileName = `${file_name}.${file_ext}`;
+            let download = document.getElementById('download-url');
+            download.src = download_url
+
+            // downloadJs(download_url,fileName);
             loading.close()
           }).catch(err=>{
             loading.close()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.140",
+  "version": "1.1.142",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {