Merge remote-tracking branch 'origin/master'

zhaowei

2025-03-06 ddd818f74d59c1fdeeed29714d660d7e49200c04

 src/views/eam/EquipmentListOfAll.vue

@@ -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"
              />
@@ -764,6 +764,18 @@
      >
        <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
      ref="modalForm"
@@ -823,6 +835,8 @@
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",
@@ -852,11 +866,19 @@
    DailyInspectionOrderListComponent,
    DailyMaintenanceOrderListComponent,
    Daily3MaintenanceOrderListComponent,
    RepairOrderListComponent,
    EquipmentCalibrationOrderComponent,
  },
  props: {
    caytegoryParam: {
      type: String,
      default: 'all',
      required: true,
    },
  },
  data() {
    return {
      description: '设备台账管理页面',
      caytegoryParam: 'all',
      // 表头
      columns: [
        {
@@ -1275,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) {
@@ -1418,6 +1443,11 @@
              }
            })
          }
          else {
            this.$message.warning('未查询到有效模板')
          }
        } else {
          this.$message.warning('未查询到有效模板')
        }
      })
    },