Merge remote-tracking branch 'origin/master'

zhaowei

2025-03-06 ddd818f74d59c1fdeeed29714d660d7e49200c04

 src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue

@@ -100,7 +100,8 @@
  },
  data() {
    return {
      description: '检定报告',
      description: '鉴定报告',
      disableMixinCreated: true,
      columns: [
        {
          title: '#',
@@ -134,11 +135,11 @@
          dataIndex: 'size',
          scopedSlots: { customRender: 'size' },
        },
        {
          title: '判定结果',
          align: 'center',
          dataIndex: 'judgmentResultName'
        },
        // {
        //   title: '判定结果',
        //   align: 'center',
        //   dataIndex: 'judgmentResultName'
        // },
        {
          title: '操作',
          align: 'center',
@@ -153,18 +154,28 @@
        urlDownload: window._CONFIG['staticDomainURL'],
        download: '/sys/upload/downloadFile',
      },
      // partRoute: {},
      // equipmentSelectionRows: [],
      calibrationOrderId: '',
    }
  },

  props: {
    calibrationOrderId: {
      type: String,
      default: '',
      required: false
    }
  },
  watch: {
    calibrationOrderId() {
      this.queryParam = {};
      this.queryParam.calibrationOrderId = this.calibrationOrderId;
      this.loadData(1);
    },
    calibrationOrderId: {
      immediate: true,
      handler(val) {
        if (!this.calibrationOrderId) {
          // this.clearList()
        } else {
          this.queryParam['calibrationOrderId'] = val;
          this.queryParam['delFlag'] = 0;
          this.loadData(1);
        }
      }
    }
  },
  // mounted() {
  //   this.$bus.$on('equipmentSelectionRows', (data) => {
@@ -273,7 +284,7 @@
    },

    handleDownload(record) {
      downFile(this.url.download, { id: record.id }).then((res) => {
      downFile(this.url.download, { id: record.upload.id }).then((res) => {
        if (!res) {
          this.$message.warning('文件下载失败')
          return