zhuo
2025-04-18 4c1dd77390f2e742d91b43e5c0bc8252fcc0bb29
1.部分导出请求参数修改成param
2.报告编制添加导出
已修改7个文件
44 ■■■■ 文件已修改
src/api/business/insReport.js 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/business/materialInspection.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/business/rawMaterialOrder.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/cnas/personal/personalList.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/materialOrder/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/rawMaterialInspection/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/reportPreparation/index.vue 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/business/insReport.js
@@ -57,3 +57,14 @@
    data: query
  })
}
// 报告导出
export function reportAllExport(query) {
  return request({
    url: '/insReport/reportAllExport',
    method: 'get',
    params: query,
    responseType: "blob"
  })
}
src/api/business/materialInspection.js
@@ -93,7 +93,7 @@
  return request({
    url: '/rawMaterialOrder/rawAllExport',
    method: 'get',
    data: query,
    params: query,
    responseType: "blob"
  })
}
src/api/business/rawMaterialOrder.js
@@ -219,7 +219,7 @@
  return request({
    url: '/rawMaterialOrder/rawAllExport',
    method: 'get',
    data: query,
    params: query,
    responseType: "blob"
  })
}
src/api/cnas/personal/personalList.js
@@ -21,7 +21,7 @@
  return request({
    url: "/personBasicInfo/exportPersonBasicInfo",
    method: "get",
    data: query,
    params: query,
    responseType: "blob"
  });
}
src/views/business/materialOrder/index.vue
@@ -67,7 +67,7 @@
            </ul>
          </div>
          <div>
            <el-button v-show="tabIndex === 3 || tabIndex === 2" :loading="outLoading" size="small" type="primary"
            <el-button v-show="tabIndex === 3" :loading="outLoading" size="small" type="primary"
              @click="handleOut">导出</el-button>
            <el-button v-if="tabIndex === 0" size="small" type="primary" @click="copper">铜材料下单</el-button>
            <el-button v-if="tabIndex !== 0" size="small" type="primary" @click="openPrint">标签打印</el-button>
@@ -1350,10 +1350,8 @@
    },
    // 导出
    handleOut() {
      let entity = this.tabIndex === 3 ? { ...this.entity, isInspect: 2 } : { ...this.entity, state: 2, orderState: 4, }
      delete entity.orderBy
      this.outLoading = true
      rawAllExport({ entity: entity }).then(res => {
      rawAllExport({ ...this.entity }).then(res => {
        this.outLoading = false
        const blob = new Blob([res], { type: 'application/octet-stream' });
        this.$download.saveAs(blob, '原材料检测信息导出.xlsx');
src/views/business/rawMaterialInspection/index.vue
@@ -822,11 +822,9 @@
    },
    // 全部导出
    handleDown() {
      let entity = { ...this.componentData }
      delete entity.orderBy
      this.outLoading = true
      rawAllExport({
        entity: entity
        ...this.componentData
      }).then(res => {
        this.outLoading = false
        const blob = new Blob([res], { type: 'application/octet-stream' });
src/views/business/reportPreparation/index.vue
@@ -29,6 +29,7 @@
    </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"
@@ -202,7 +203,8 @@
  ratifyReport,
  sendBackTask,
  upReportUrl,
  writeReport
  writeReport,
  reportAllExport
} from "@/api/business/insReport";
import { mapGetters } from "vuex";
import { selectUserCondition } from "@/api/business/inspectionTask";
@@ -217,6 +219,7 @@
        queryStatus: null,
        code: null,
        typeSource: null,
        orderType: null,
      },
      page: {
        current: 1,
@@ -241,6 +244,7 @@
      option: null,
      mutiList: [],
      outLoading: false,
      outExportLoading: false,
      inLoading: false,
      addApproverDia: false, // 指定审批人员弹框
      approver: '', // 审批人员
@@ -600,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) {