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'>
@@ -15,10 +15,10 @@
            :sm='8'
          >
            <a-form-item label='工单编码'>
              <a-input
              <j-input
                placeholder='请输入工单编码'
                v-model='queryParam.num'
              ></a-input>
              ></j-input>
            </a-form-item>
          </a-col>
          <!-- <a-col
@@ -46,7 +46,7 @@
                icon='search'
              >查询</a-button>
              <a-button
                type='primary'
                type='info'
                @click='searchReset'
                icon='reload'
                style='margin-left: 8px'
@@ -64,6 +64,7 @@
        @click='handleAdd'
        type='primary'
        icon='plus'
        v-has="'calibrationOrder:add'"
      >新增
      </a-button>
    </div>
@@ -74,8 +75,7 @@
        class='ant-alert ant-alert-info'
        style='margin-bottom: 16px;'
      >
        <i class='anticon anticon-info-circle ant-alert-icon'></i> 已选择 <a
        style='font-weight: 600'>{{ selectedRowKeys.length }}</a>项
        <i class='anticon anticon-info-circle ant-alert-icon'></i> 已选择 <a style='font-weight: 600'>{{ selectedRowKeys.length }}</a>项
        <a
          style='margin-left: 24px'
          @click='onClearSelected'
@@ -85,7 +85,7 @@
      <a-table
        ref='table'
        size='middle'
        :scroll="{ x: 'calc(700px + 50%)', y: 900 }"
        :scroll="{ x: 'calc(1000px + 50%)', y: 900 }"
        bordered
        rowKey='id'
        :columns='columns'
@@ -102,15 +102,37 @@
          slot='action'
          slot-scope='text, record'
        >
           <a
             v-if="record.status === '1'"
             @click='handleAddOrderReport(record)'
           >结果录入</a>
           <a-divider
             v-if="record.status === '1'"
             type='vertical'
           />
               <a @click='handleDetail(record)'>详情</a>
          <a
            v-show="record.status === '1' || record.status === '3'"
            @click='handleAddOrderReport(record)'
            v-has="'calibrationOrder:write'"
          >结果录入</a>

          <a-divider
            v-show="record.status === '1' || record.status === '3'"
            type='vertical'
          />
          <a
            v-show="record.status === '2' && record.equipmentImportance != 'D'"
            @click='handleTechnologyStatus(record)'
            v-has="'calibrationOrder:audit'"
          >结果审核</a>

          <a-divider
            v-show="record.status === '2' && record.equipmentImportance != 'D'"
            type='vertical'
          />
          <a
            v-show="record.status === '2' && record.equipmentImportance == 'D'"
            @click='handleTechnologyStatusAuthenticate(record)'
            v-has="'calibrationOrder:authenticate'"
          >D类技术状态鉴定</a>

          <a-divider
            v-show="record.status === '2' && record.equipmentImportance == 'D'"
            type='vertical'
          />
          <a @click='handleDetail(record)'>详情</a>
          <!--          <a-popconfirm-->
          <!--            title='确定下发工单吗?'-->
          <!--            @confirm='() => handleOrderIssue(record)'-->
@@ -194,7 +216,7 @@
          <!--          </a-dropdown>-->
        </span>

        <span
        <!-- <span
          slot='num'
          slot-scope='text, record'
        >
@@ -205,11 +227,9 @@
          >{{ record.num }}</a>

          <span v-else>{{ record.num }}</span>
        </span>
        </span> -->
      </a-table>
      <a-tabs
        defaultActiveKey='2'
      >
      <a-tabs defaultActiveKey='2'>
        <!--        <a-tab-pane  -->
        <!--          key="1"-->
        <!--          tab="检验项"-->
@@ -219,10 +239,12 @@

        <a-tab-pane
          key='2'
          tab='检定报告'
          tab='鉴定报告'
        >
          <equipment-calibration-order-report-list ref='EquipmentCalibrationOrderReportList'
                                                   :calibrationOrderId='mainId'></equipment-calibration-order-report-list>
          <equipment-calibration-order-report-list
            ref='EquipmentCalibrationOrderReportList'
            :calibrationOrderId='mainId'
          ></equipment-calibration-order-report-list>
        </a-tab-pane>

      </a-tabs>
@@ -237,12 +259,25 @@
      ref='EquipmentCalibrationOrderExeDrawer'
      @ok='modalFormOk'
    ></equipment-calibration-order-exe-drawer>
    <final-modal ref='finalModal' @ok='modalFormOk'></final-modal>
    <final-modal
      ref='finalModal'
      @ok='modalFormOk'
    ></final-modal>

    <equipment-calibration-order-report-modal
      ref='equipmentCalibrationOrderReportModal'
      @ok='modalFormOk'
    ></equipment-calibration-order-report-modal>

    <equipment-technology-status-modal
      ref="EquipmentTechnologyStatusModal"
      @ok="modalFormOk"
    ></equipment-technology-status-modal>

    <technology-status-authenticate-modal
      ref="TechnologyStatusAuthenticateModal"
      @ok="modalFormOk"
    ></technology-status-authenticate-modal>
  </a-card>
</template>

@@ -259,6 +294,9 @@
import FinalModal from './modules/equipmentCalibrationOrder/FinalModal.vue'
import EquipmentCalibrationOrderReportModal
  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',
@@ -269,15 +307,18 @@
    EquipmentPrecisionParametersList,
    EquipmentCalibrationOrderReportList,
    EquipmentCalibrationOrderReportModal,
    FinalModal
    FinalModal,
    EquipmentTechnologyStatusModal,
    TechnologyStatusAuthenticateModal
  },
  data() {
    return {
      description: '技术状态鉴定管理',
      disableMixinCreated: true,
      ipagination: {
        current: 1,
        pageSize: 5,
        pageSizeOptions: ['5', '10', '50'],
        pageSize: 20,
        pageSizeOptions: ['5', '10', '20', '50'],
        showTotal: (total, range) => {
          return range[0] + '-' + range[1] + ' 共' + total + '条'
        },
@@ -295,7 +336,7 @@
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
          customRender: function (t, r, index) {
            return parseInt(index) + 1
          }
        },
@@ -307,10 +348,20 @@
          // scopedSlots: { customRender: 'num' }
        },
        {
          title: '检定方式',
          title: '状态',
          align: 'center',
          dataIndex: 'calibrationType_dictText'
          dataIndex: 'status_dictText'
        },
        {
          title: '判定结果',
          align: 'center',
          dataIndex: 'calibrationResult_dictText'
        },
        // {
        //   title: '检定方式',
        //   align: 'center',
        //   dataIndex: 'calibrationType_dictText'
        // },
        {
          title: '统一编码',
          align: 'center',
@@ -331,31 +382,22 @@
          align: 'center',
          dataIndex: 'equipmentSpecification'
        },
        {
          title: '判定依据',
          align: 'center',
          dataIndex: 'managementMode_dictText'
        },
        {
          title: '状态',
          align: 'center',
          dataIndex: 'status_dictText'
        },
        {
          title: '判定结果',
          align: 'center',
          dataIndex: 'calibrationResult_dictText'
        },
        // {
        //   title: '判定依据',
        //   align: 'center',
        //   dataIndex: 'managementMode_dictText'
        // },

        // {
        //   title: '创建人',
        //   align: 'center',
        //   dataIndex: 'createBy'
        // },
        // {
        //   title: '创建日期',
        //   align: 'center',
        //   dataIndex: 'createTime'
        // },
        {
          title: '创建日期',
          align: 'center',
          dataIndex: 'createTime'
        },
        // {
        //   title: '检定人',
        //   align: 'center',
@@ -366,6 +408,11 @@
          align: 'center',
          dataIndex: 'calibrationTime'
        },
        {
          title: '审核意见',
          align: 'center',
          dataIndex: 'remark'
        },
        // {
        //   title: '下发时间',
        //   align: 'center',
@@ -375,8 +422,8 @@
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          width: 200,
          fixed: 'right',
          width: 120,
          scopedSlots: { customRender: 'action' }
        }
      ],
@@ -390,9 +437,20 @@
  },

  computed: {
    importExcelUrl: function() {
    importExcelUrl: function () {
      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: {
@@ -407,9 +465,22 @@
      this.selectionRows = selectionRows
    },

    handleTechnologyStatus(record) {
      this.$refs.EquipmentTechnologyStatusModal.edit(record);
      this.$refs.EquipmentTechnologyStatusModal.title = "审核";
      this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false;
    },

    handleTechnologyStatusAuthenticate: function (record) {
      this.$refs.TechnologyStatusAuthenticateModal.edit(record);
      this.$refs.TechnologyStatusAuthenticateModal.title = "技术状态编辑";
      this.$refs.TechnologyStatusAuthenticateModal.disableSubmit = false;

    },

    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//保存、暂存、报工
@@ -461,14 +532,15 @@
      }
    },
    // 直接上传鉴定报告
    handleAddOrderReport: function(record) {
    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>