Merge remote-tracking branch 'origin/master'

zhaowei

2025-07-11 56148970959b7016cfe1c54ffa39dbd9bb9921ff

 src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue

@@ -65,7 +65,6 @@
            <a-divider type="vertical" v-if="record.maintenanceStatus === 'COMPLETE'"/>
            <a v-if="record.maintenanceStatus === 'COMPLETE'" @click="handlePrint(record)">打印</a>
          </template>

        </span>
      </a-table>
    </div>
@@ -74,8 +73,7 @@
    <!-- 表单区域 -->
    <eamSecondMaintenanceOrder-modal ref="modalForm" @ok="modalFormOk"/>

    <second-maintenance-approval-modal ref="secondMaintenanceApprovalModal"
                                       :selectShenpiData="selectSecondMaintenanceData"/>
    <second-maintenance-approval-modal ref="secondMaintenanceApprovalModal" :selectShenpiData="selectSecondMaintenanceData"/>
  </a-card>
</template>

@@ -83,8 +81,7 @@
  import EamSecondMaintenanceOrderModal from './modules/EamSecondMaintenanceOrderModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import { deleteAction, getAction } from '@api/manage'
  import SecondMaintenanceApprovalModal
    from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
  import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
  import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'

  export default {
@@ -166,7 +163,7 @@
          {
            title: '维修工',
            align: 'center',
            dataIndex: 'operator_dictText'
            dataIndex: 'repairer_dictText'
          },
          {
            title: '保养状态',
@@ -191,12 +188,12 @@
          {
            title: '检查人确认',
            align: 'center',
            dataIndex: 'confirmLeader_dictText'
            dataIndex: 'inspector_dictText'
          },
          {
            title: '检查人确认时间',
            align: 'center',
            dataIndex: 'leaderConfirmTime'
            dataIndex: 'inspectConfirmTime'
          },
          {
            title: 'HF编码',