Merge remote-tracking branch 'origin/master'

zhaowei

2025-03-06 ddd818f74d59c1fdeeed29714d660d7e49200c04

 src/views/eam/EquipmentListOfAll.vue

@@ -18,7 +18,7 @@
                :md='8'
                :sm='24'>
            <a-form-item
              label="统一编号群"
              label="统一编码群"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
@@ -39,7 +39,7 @@
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                dictCode="mom_eam_equipment_category,name,id,del_flag!='1'"
                :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id,del_flag!=\'1\'':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
                placeholder="请输入搜索条件并选择"
                v-model="queryParam.equipmentCategoryId"
              />
@@ -372,6 +372,13 @@
        v-has="'equipmentAccount:add&delete&import&Edit'"
      >质保期变更</a-button>
      <a-button
        :disabled="selectedRowKeys.length==0"
        @click="batchDel"
        type="danger"
        icon="delete"
        v-has="'equipmentAccount:add&delete&import&Edit'"
      >批量删除</a-button>
      <a-button
        @click="handleUpdateKeyEquipment"
        type="primary"
        icon="calendar"
@@ -679,7 +686,6 @@
      <a-tab-pane
        tab="设备文档"
        key="1"
        forceRender
      >
        <EquipmentDocumentList :mainId="selectedMainId" />
      </a-tab-pane>
@@ -706,44 +712,69 @@
      <a-tab-pane
        tab="备件"
        key="4"
        forceRender
      >
        <EquipmentSpareParts :mainId="selectedMainId" />
      </a-tab-pane>
      <a-tab-pane
        tab="ABC标识变更记录"
        key="5"
        forceRender
      >
        <equipment-update-ABC-list :mainId="selectedMainId" />
      </a-tab-pane>
      <a-tab-pane
        tab="质保期变更"
        key="6"
        forceRender
      >
        <equipment-update-warranty-list :mainId="selectedMainId" />
      </a-tab-pane>
      <a-tab-pane
        tab="点检标准"
        key="7"
        forceRender
      >
        <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
      </a-tab-pane>

      <a-tab-pane
        tab="二保标准"
        key="8"
        forceRender
      >
        <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
      </a-tab-pane>
      <a-tab-pane
        tab="三保标准"
        key="9"
        forceRender
      >
        <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
      </a-tab-pane>
      <a-tab-pane
        tab="点检工单"
        key="10"
      >
        <daily-inspection-order-list-component :mainId="selectedMainId"></daily-inspection-order-list-component>
      </a-tab-pane>
      <a-tab-pane
        tab="二保工单"
        key="11"
      >
        <daily-maintenance-order-list-component :mainId="selectedMainId"></daily-maintenance-order-list-component>
      </a-tab-pane>
      <a-tab-pane
        tab="三保工单"
        key="12"
      >
        <daily3-maintenance-order-list-component :mainId="selectedMainId"></daily3-maintenance-order-list-component>
      </a-tab-pane>
      <a-tab-pane
        tab="维修工单"
        key="13"
      >
        <repair-order-list-component :mainId="selectedMainId"></repair-order-list-component>
      </a-tab-pane>
      <a-tab-pane
        tab="技术状态鉴定"
        key="14"
      >
        <equipment-calibration-order-component :mainId="selectedMainId"></equipment-calibration-order-component>
      </a-tab-pane>
    </a-tabs>
    <equipment-modal
@@ -780,7 +811,7 @@
import { mixinDevice } from '@/utils/mixin'
import JEllipsis from '@/components/jeecg/JEllipsis'
import EquipmentModal from './modules/equipmentNew/EquipmentModal'
import { getAction, downFile } from '@/api/manage'
import { getAction, downFile, deleteAction } from '@/api/manage'
import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
@@ -801,6 +832,11 @@
import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
import KeyEquipmentUpdateModel from './modules/equipmentNew/edit/KeyEquipmentUpdateModel.vue'
import DailyInspectionOrderListComponent from './modules/equipmentNew/DailyInspectionOrderListComponent.vue'
import DailyMaintenanceOrderListComponent from './modules/equipmentNew/DailyMaintenanceOrderListComponent.vue'
import Daily3MaintenanceOrderListComponent from './modules/equipmentNew/Daily3MaintenanceOrderListComponent.vue'
import RepairOrderListComponent from './modules/equipmentNew/RepairOrderListComponent.vue'
import EquipmentCalibrationOrderComponent from './modules/equipmentNew/EquipmentCalibrationOrderComponent.vue'

export default {
  name: "EquipmentList",
@@ -827,11 +863,22 @@
    ThirdMaintenanceList,
    KeyEquipmentUpdateModel,
    JEllipsis,
    DailyInspectionOrderListComponent,
    DailyMaintenanceOrderListComponent,
    Daily3MaintenanceOrderListComponent,
    RepairOrderListComponent,
    EquipmentCalibrationOrderComponent,
  },
  props: {
    caytegoryParam: {
      type: String,
      default: 'all',
      required: true,
    },
  },
  data() {
    return {
      description: '设备台账管理页面',
      caytegoryParam: 'all',
      // 表头
      columns: [
        {
@@ -1250,7 +1297,10 @@
        this.ipagination.current = 1;
      }
      this.onClearSelected()
      var params = this.getQueryParams();//查询条件
      if(this.caytegoryParam !== 'all') {
        this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
      }
      let params = this.getQueryParams();//查询条件
      this.loading = true;
      getAction(this.url.list, params).then((res) => {
        if (res.success) {
@@ -1393,6 +1443,11 @@
              }
            })
          }
          else {
            this.$message.warning('未查询到有效模板')
          }
        } else {
          this.$message.warning('未查询到有效模板')
        }
      })
    },