提取打印回执单功能

src/service/bjdService.js

@@ -1,5 +1,7 @@
 import XLSX from 'xlsx'
 import common from '@/utils/common'
+import qs from 'qs'
+import preview from '@/utils/preview'
 
 export default {
   /**
@@ -101,5 +103,39 @@ export default {
     }
     reader.readAsArrayBuffer(file)
     loading.close()
+  },
+  /**
+   * 批量打印回执单
+   *
+   * @param bjdIds  报检单主键数组
+   * @return {Promise<AxiosResponse<any>>}
+   */
+  batchPrintHzd(bjdIds) {
+    return new Promise(resolve => {
+      preview({
+        url: '/print/batchGeneratePdfHzd',
+        method: 'get',
+        params: {
+          bjdIds: bjdIds
+        },
+        paramsSerializer: function(params) {
+          return qs.stringify(params, { indices: false })
+        }
+      }).then((data) => {
+        preview({
+          url: '/print/createXmlOther',
+          method: 'post',
+          params: {
+            ids: bjdIds,
+            type: 'HZD'
+          },
+          paramsSerializer: function(params) {
+            return qs.stringify(params, { indices: false })
+          }
+        }).then((data) => {
+          resolve(data)
+        })
+      })
+    })
   }
 }

src/views/bjd/dj_input.vue

@@ -2352,25 +2352,7 @@ export default {
             Utils.$emit('allot-list')
             if (audit) {
               this.$message({ message: '审核成功', type: 'success' })
-              // 不是锅炉定检科室时，提示是否打印回执单
-              if (this.$store.getters.departmentId !== 75) {
-                this.$confirm('是否打印回执单?', '提示', {
-                  confirmButtonText: '确定',
-                  cancelButtonText: '取消',
-                  type: 'warning'
-                })
-                  .then(() => {
-                    this.printHzd()
-                  })
-                  .catch(() => {
-                    this.$store.dispatch('delCurrentViews', {
-                      view: this.$route,
-                      $router: this.$router
-                    })
-                  })
-              } else {
               this.deleteCurrentView()
-              }
               // 更新省局设备状态
               this.apisjse({
                 url: '/baseInfo/updateStateAndRiqiByIds',

src/views/bjd/dj_list.vue

@@ -527,34 +527,10 @@ export default {
         })
         return false
       }
-      const arr = this.$refs.bjdList.selection.map((bjd) => {
-        return bjd.id
-      })
-      console.log(arr)
-      this.preview({
-        url: '/print/batchGeneratePdfHzd',
-        method: 'get',
-        params: {
-          bjdIds: arr
-        },
-        paramsSerializer: function(params) {
-          return qs.stringify(params, { indices: false })
-        }
-      }).then((data) => {
-        this.preview({
-          url: '/print/createXmlOther',
-          method: 'post',
-          params: {
-            ids: arr,
-            type: 'HZD'
-          },
-          paramsSerializer: function(params) {
-            return qs.stringify(params, { indices: false })
-          }
-        }).then((data) => {
+      const bjdIds = this.$refs.bjdList.selection.map(bjd => bjd.id)
+      this.bjdService.batchPrintHzd(bjdIds).then((data) => {
         this.printbutton = 'ReportPrintApp://' + data
       })
-      })
     },
     // 打印回执单
     printHzd() {

src/views/bjd/jj_input.vue

@@ -1411,16 +1411,8 @@ export default {
             Utils.$emit('bjd-list')
             Utils.$emit('allot-list')
             if (audit) {
-              this.$store.dispatch('delCurrentViews', {
-                view: this.$route,
-                $router: this.$router
-              })
+              this.deleteCurrentView()
               this.$message({ message: '审核成功', type: 'success' })
-              if (this.bjd.dataSource === 1) {
-                this.smsSendResult('已通过', '根据施工进度', '【申请现场检验】')
-                // 您的${project}项目报检申请资料审核${status}。请${action}登录企业管理平台${action1}。咨询电话：${phone}。
-                // 【济南市特种设备检验研究院】您的43项目报检申请资料审核已通过，请根据施工进度登录企业管理平台[申请现场检验]。咨询电话:89738113。
-              }
             } else {
               this.tableData = data.renwus
               for (const tableObj of this.tableData) {

src/views/bjd/jj_list.vue

@@ -413,34 +413,10 @@ export default {
         this.$message({ message: '请选择至少一条数据进行打印！', type: 'error' })
         return false
       }
-      const arr = this.$refs.bjdList.selection.map((bjd) => {
-        return bjd.id
-      })
-      console.log(arr)
-      this.preview({
-        url: '/print/batchGeneratePdfHzd',
-        method: 'get',
-        params: {
-          bjdIds: arr
-        },
-        paramsSerializer: function(params) {
-          return qs.stringify(params, { indices: false })
-        }
-      }).then((data) => {
-        this.preview({
-          url: '/print/createXmlOther',
-          method: 'post',
-          params: {
-            ids: arr,
-            type: 'HZD'
-          },
-          paramsSerializer: function(params) {
-            return qs.stringify(params, { indices: false })
-          }
-        }).then((data) => {
+      const bjdIds = this.$refs.bjdList.selection.map((bjd) => bjd.id)
+      this.bjdService.batchPrintHzd(bjdIds).then((data) => {
         this.printbutton = 'ReportPrintApp://' + data
       })
-      })
     },
     // 打印回执单
     printHzd() {