From 219abf188da613a60bdffa65c1c2b6b71761b303 Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Wed, 25 Aug 2021 21:23:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8F=96=E6=89=93=E5=8D=B0=E5=9B=9E?= =?UTF-8?q?=E6=89=A7=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/bjdService.js | 36 ++++++++++++++++++++++++++++++++++++ src/views/bjd/dj_input.vue | 20 +------------------- src/views/bjd/dj_list.vue | 30 +++--------------------------- src/views/bjd/jj_input.vue | 10 +--------- src/views/bjd/jj_list.vue | 30 +++--------------------------- 5 files changed, 44 insertions(+), 82 deletions(-) diff --git a/src/service/bjdService.js b/src/service/bjdService.js index 7a9f824..139d792 100644 --- a/src/service/bjdService.js +++ b/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>} + */ + 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) + }) + }) + }) } } diff --git a/src/views/bjd/dj_input.vue b/src/views/bjd/dj_input.vue index 1b2316b..ffc5279 100644 --- a/src/views/bjd/dj_input.vue +++ b/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.deleteCurrentView() // 更新省局设备状态 this.apisjse({ url: '/baseInfo/updateStateAndRiqiByIds', diff --git a/src/views/bjd/dj_list.vue b/src/views/bjd/dj_list.vue index 4c74541..377297a 100644 --- a/src/views/bjd/dj_list.vue +++ b/src/views/bjd/dj_list.vue @@ -527,33 +527,9 @@ 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) => { - this.printbutton = 'ReportPrintApp://' + data - }) + const bjdIds = this.$refs.bjdList.selection.map(bjd => bjd.id) + this.bjdService.batchPrintHzd(bjdIds).then((data) => { + this.printbutton = 'ReportPrintApp://' + data }) }, // 打印回执单 diff --git a/src/views/bjd/jj_input.vue b/src/views/bjd/jj_input.vue index 655ca2a..764842b 100644 --- a/src/views/bjd/jj_input.vue +++ b/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) { diff --git a/src/views/bjd/jj_list.vue b/src/views/bjd/jj_list.vue index e9ec88b..090df23 100644 --- a/src/views/bjd/jj_list.vue +++ b/src/views/bjd/jj_list.vue @@ -413,33 +413,9 @@ 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) => { - this.printbutton = 'ReportPrintApp://' + data - }) + const bjdIds = this.$refs.bjdList.selection.map((bjd) => bjd.id) + this.bjdService.batchPrintHzd(bjdIds).then((data) => { + this.printbutton = 'ReportPrintApp://' + data }) }, // 打印回执单