From b807a12b89dc9126bac49c02a3902bec758f4f9b Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期一, 09 六月 2025 11:55:27 +0800 Subject: [PATCH] 检验标准未带出 --- src/views/business/reportPreparation/index.vue | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue index 3ff9d9c..785e9f1 100644 --- a/src/views/business/reportPreparation/index.vue +++ b/src/views/business/reportPreparation/index.vue @@ -22,11 +22,14 @@ </el-select> </el-form-item> <el-form-item> - <el-button size="mini" @click="refresh()">閲嶇疆</el-button> <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button> - <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button> + <el-button size="mini" @click="refresh()">閲嶇疆</el-button> </el-form-item> </el-form> + </div> + <div style="text-align: right;margin-bottom: 10px"> + <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button> + <el-button :loading="outExportLoading" size="mini" type="primary" @click="handleExport">鎶ヨ〃瀵煎嚭</el-button> </div> <div> <lims-table :tableData="valueTableData" :column="column" :page="page" :tableLoading="tableLoading" @@ -184,7 +187,7 @@ <el-button size="small" style="height: 38px" type="primary">闄勪欢涓婁紶</el-button> </el-upload> </div> - <lims-table :tableData="tableDataFile" :column="columnFile" height="500px" + <lims-table :tableData="tableDataFile" :column="columnFile" height="600px" key="tableDataFile" :tableLoading="tableLoadingFile"></lims-table> </el-dialog> </div> @@ -200,13 +203,15 @@ ratifyReport, sendBackTask, upReportUrl, - writeReport + writeReport, + reportAllExport } from "@/api/business/insReport"; import { mapGetters } from "vuex"; import { selectUserCondition } from "@/api/business/inspectionTask"; import limsTable from "@/components/Table/lims-table.vue"; import {delFile, downFile, getFileList} from "@/api/business/rawMaterialOrder"; export default { + name: 'ReportPreparation', components: { limsTable, onlyoffice }, data() { return { @@ -214,6 +219,7 @@ queryStatus: null, code: null, typeSource: null, + orderType: null, }, page: { current: 1, @@ -238,6 +244,7 @@ option: null, mutiList: [], outLoading: false, + outExportLoading: false, inLoading: false, addApproverDia: false, // 鎸囧畾瀹℃壒浜哄憳寮规 approver: '', // 瀹℃壒浜哄憳 @@ -518,7 +525,7 @@ // 鏌ヨ闄勪欢鏌ョ湅鍒楄〃鍥炶皟 getFileList() { this.tableLoadingFile = true - getFileList({ insOrderId: this.filesLookInfo.insOrderId }).then(res => { + getFileList({ insOrderId: this.filesLookInfo.insOrderId,current: -1, size: -1 }).then(res => { this.tableLoadingFile = false if (res.code === 200) { this.tableDataFile = res.data.records @@ -547,7 +554,7 @@ downFile({ id: row.id, }).then(res => { - this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName); + this.$download.saveAs(res.data.fileUrl, row.fileName); }).catch(error => { }) @@ -597,6 +604,17 @@ }) }, + // 鎶ヨ〃瀵煎嚭 + handleExport() { + this.outExportLoading = true + reportAllExport({ + ...this.entity + }).then(res => { + this.outExportLoading = false + const blob = new Blob([res], { type: 'application/octet-stream' }); + this.$download.saveAs(blob, "鎶ュ憡鎶ヨ〃瀵煎嚭.xlsx"); + }) + }, beforeUpload(file) { const isZip = file.type === 'application/zip' || file.name.endsWith('.zip'); if (!isZip) { @@ -609,6 +627,7 @@ }, fileBeforeUpload(file) { let flag = true + console.log('file----', file) if (file.size > 1024 * 1024 * 10) { this.$message.error('涓婁紶鏂囦欢涓嶈秴杩�10M'); this.$refs.upload.clearFiles() @@ -660,7 +679,7 @@ case 0: // 鍘熸潗鏂� this.$router.push({ - path: "/materialOrder/customsInspection", query: { + path: "/materialOrder/customsInspectionView", query: { customsInspection: row, active: this.activeFace, currentId: row.insOrderId, @@ -671,7 +690,7 @@ case null: // 鎴愬搧 this.$router.push({ - path: "/productOrder/add", query: { + path: "/productOrder/addView", query: { examine: this.examine, active: this.activeFace, currentId: row.insOrderId @@ -681,7 +700,7 @@ case 1: // 閾滄潗 this.$router.push({ - path: "/materialOrder/copperOrder", query: { + path: "/materialOrder/CopperView", query: { active: this.activeFace, currentId: row.insOrderId } @@ -734,6 +753,7 @@ }, // 鏌ョ湅鎶ュ憡 viewIssued(row) { + console.log('this.javaApi', this.javaApi) this.currentInfo = row; let fileName = (row.urlS === null || row.urlS === '') ? row.url : row.urlS let fileType = "docx" @@ -812,7 +832,7 @@ }, // 鑾峰彇浜哄憳鍒楄〃 getAuthorizedPerson() { - selectUserCondition({ type: 0 }).then((res) => { + selectUserCondition({ type: 1 }).then((res) => { let data = []; res.data.forEach((a) => { data.push({ -- Gitblit v1.9.3