Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-12-18 26c4f7ae79ad5ad2300876b94f96f19e4f93d53a

 src/views/quality/rawMaterial/index.vue

@@ -27,7 +27,7 @@
            @queryParam="getQueryParam($event)"
            ref="rawMaterialTable">
            <template #toolbar>
                <el-button @click="exportRawMaterial" type="primary" >导出</el-button>
                <!-- <el-button @click="exportRawMaterial" type="primary" >导出</el-button> -->
            </template>
            </ttable>
        </basic-container>
@@ -287,8 +287,11 @@
                    this.$message.error("只能选择已检测的数据")
                    return
                }
                console.log(selection)
                downloadReport().then(res=>{
                let ids = []
                selection.forEach(ele=>{
                    ids.push(ele.id)
                })
                downloadReport({ids : ids}).then(res=>{
                    transformZip(res)
                }).catch(error=>{
                    console.log(error)
@@ -329,7 +332,6 @@
        },
        exportRawMaterial(){
            exportRawMaterial(this.queryParam).then(res=>{
                console.log(res)
                this.downloadFun(res)
            }).catch(error=>{
                console.log(error);