Merge remote-tracking branch 'origin/master'

zhaowei

2025-03-06 ddd818f74d59c1fdeeed29714d660d7e49200c04

 src/views/eam/EquipmentCalibrationOrder.vue

@@ -1,7 +1,7 @@
<template>
  <a-card
    :bordered='false'
    title='技术状态鉴定管理'
    title=''
  >
    <!-- 查询区域 -->
    <div class='table-page-search-wrapper'>
@@ -46,7 +46,7 @@
                icon='search'
              >查询</a-button>
              <a-button
                type='primary'
                type='info'
                @click='searchReset'
                icon='reload'
                style='margin-left: 8px'
@@ -239,7 +239,7 @@

        <a-tab-pane
          key='2'
          tab='检定报告'
          tab='鉴定报告'
        >
          <equipment-calibration-order-report-list
            ref='EquipmentCalibrationOrderReportList'
@@ -296,6 +296,7 @@
  from './modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal'
import EquipmentTechnologyStatusModal from './modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal'
import TechnologyStatusAuthenticateModal from './modules/equipmentCalibrationOrder/TechnologyStatusAuthenticateModal'
import { interceptorFunc } from 'vxe-table'

export default {
  name: 'EquipmentCalibrationOrder',
@@ -313,6 +314,7 @@
  data() {
    return {
      description: '技术状态鉴定管理',
      disableMixinCreated: true,
      ipagination: {
        current: 1,
        pageSize: 20,
@@ -391,11 +393,11 @@
        //   align: 'center',
        //   dataIndex: 'createBy'
        // },
        // {
        //   title: '创建日期',
        //   align: 'center',
        //   dataIndex: 'createTime'
        // },
        {
          title: '创建日期',
          align: 'center',
          dataIndex: 'createTime'
        },
        // {
        //   title: '检定人',
        //   align: 'center',
@@ -439,6 +441,17 @@
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
    }
  },
  created() {
    //从路由中获取查询条件
    if (this.$route.query) {
      this.queryParam.equipmentId = this.$route.query.equipmentId;
      //查询条件按时间倒序
      this.queryParam.sort = 'createTime';
      this.queryParam.order = 'desc';
    }
    this.loadData()
    this.initDictConfig();
  },

  methods: {

@@ -467,7 +480,7 @@

    handleOrderExe(record) {
      this.$refs.EquipmentCalibrationOrderExeDrawer.visible = true
      this.$refs.EquipmentCalibrationOrderExeDrawer.title = '检定工单执行'
      this.$refs.EquipmentCalibrationOrderExeDrawer.title = '鉴定工单执行'
      this.$refs.EquipmentCalibrationOrderExeDrawer.handleShow(record)
      if (record.status === '4') {
        this.$refs.EquipmentCalibrationOrderExeDrawer.buttonDistable = true//保存、暂存、报工
@@ -521,12 +534,13 @@
    // 直接上传鉴定报告
    handleAddOrderReport: function (record) {
      this.$refs.equipmentCalibrationOrderReportModal.add(record.id)
      this.$refs.equipmentCalibrationOrderReportModal.title = '上传检定报告'
      this.$refs.equipmentCalibrationOrderReportModal.title = '上传鉴定报告'
      this.$refs.equipmentCalibrationOrderReportModal.disableSubmit = false
    },
    handleFinal(record) {
      this.$refs.finalModal.edit(record)
    }
    },
    
  }
}
</script>