06367391d2f853a302266a1dfba8da5e813f8761..d267d7082d3a708e4b2b9f569250a3a588cb54ca
2024-01-30 zouyu
Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
d267d7 对比 | 目录
2024-01-30 zouyu
质检报告修改
7fca02 对比 | 目录
已修改2个文件
38 ■■■■ 文件已修改
src/views/quality/finishedProductInspection/index.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/rawMaterial/index.vue 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/finishedProductInspection/index.vue
@@ -205,6 +205,8 @@
            this.table.toolbar.push({
                text: '下载检验报告',
                type: 'primary',
                loading: false,
                disabled: false,
                fun: this.downloadProReport
            })
        }
@@ -229,6 +231,7 @@
    },
    methods: {
        downloadProReport(){
            const _than = this
            let selection = this.multipleSelection
            if(!selection || selection.length < 1){
                this.$message.error("请先选择检验数据")
@@ -245,11 +248,18 @@
                selection.forEach(ele=>{
                    ids.push(ele.id)
                })
                downloadReport({ids : ids}).then(res=>{
                    transformZip(res)
                }).catch(error=>{
                _than.table.toolbar.find((e) => e.text === '下载检验报告').loading = true
                _than.table.toolbar.find((e) => e.text === '下载检验报告').disabled = true
                try {
                    downloadReport({ids : ids}).then(res=>{
                        transformZip(res)
                    })
                } catch (error) {
                    console.log(error)
                })
                } finally{
                    _than.table.toolbar.find((e) => e.text === '下载检验报告').loading = false
                    _than.table.toolbar.find((e) => e.text === '下载检验报告').disabled = false
                }
            }
        },
        //打印按钮
src/views/quality/rawMaterial/index.vue
@@ -256,7 +256,10 @@
            this.table.toolbar.push({
                text: '下载检验报告',
                type: 'primary',
                fun: this.downloadReport
                loading: false,
                disabled: false,
                fun: this.downloadReport,
            })
        }
        if(this.permissions.quality_rawMaterial_del){
@@ -296,11 +299,18 @@
                selection.forEach(ele=>{
                    ids.push(ele.id)
                })
                downloadReport({ids : ids}).then(res=>{
                    transformZip(res)
                }).catch(error=>{
                this.table.toolbar.find((e) => e.text === '下载检验报告').loading = true
                this.table.toolbar.find((e) => e.text === '下载检验报告').disabled = true
                try{
                    downloadReport({ids : ids}).then(res=>{
                        transformZip(res)
                    })
                }catch(error){
                    console.log(error)
                })
                } finally{
                    this.table.toolbar.find((e) => e.text === '下载检验报告').loading = false
                    this.table.toolbar.find((e) => e.text === '下载检验报告').disabled = false
                }
            }
        },
        //查看报告按钮