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"
@@ -558,6 +565,51 @@
            :length="8"
          />
        </span>
        <span
          slot="yseNoInspectionStandard"
          slot-scope="text"
        >
          <a-icon
            type="check"
            style="color: chartreuse;"
            v-if="text==='0'"
          />
          <a-icon
            type="close"
            v-else
            style="color:red;"
          />
        </span>
        <span
          slot="yseNoMaintenance2Standard"
          slot-scope="text"
        >
          <a-icon
            type="check"
            style="color: chartreuse;"
            v-if="text==='0'"
          />
          <a-icon
            type="close"
            v-else
            style="color:red;"
          />
        </span>
        <span
          slot="yseNoMaintenance3Standard"
          slot-scope="text"
        >
          <a-icon
            type="check"
            style="color: chartreuse;"
            v-if="text==='0'"
          />
          <a-icon
            type="close"
            v-else
            style="color:red;"
          />
        </span>

        <template
          slot="num"
@@ -632,8 +684,15 @@

    <a-tabs defaultActiveKey="1">
      <a-tab-pane
        tab="工艺参数"
        tab="设备文档"
        key="1"
      >
        <EquipmentDocumentList :mainId="selectedMainId" />
      </a-tab-pane>
      <a-tab-pane
        tab="工艺参数"
        key="2"
        v-if="isOpenProcess"
      >
        <EquipmentProcessParametersList
          :mainId="selectedMainId"
@@ -642,8 +701,8 @@
      </a-tab-pane>
      <a-tab-pane
        tab="设备精度"
        key="2"
        forceRender
        key="3"
        v-if="isOpenPrecision"
      >
        <EquipmentPrecisionParametersList
          :isOpen="isOpenPrecision"
@@ -651,53 +710,71 @@
        />
      </a-tab-pane>
      <a-tab-pane
        tab="设备文档"
        key="3"
        forceRender
      >
        <EquipmentDocumentList :mainId="selectedMainId" />
      </a-tab-pane>
      <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="日保标准"
        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
@@ -734,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'
@@ -755,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",
@@ -781,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: [
        {
@@ -797,16 +890,61 @@
            return parseInt(index) + 1
          },
          width: 50,
          fixed: 'left',
        },
        {
          title: '设备类型',
          title: '统一编码',
          align: "center",
          dataIndex: 'num',
          scopedSlots: { customRender: 'num' },
          fixed: 'left',
        },
        {
          title: '设备名称',
          align: "center",
          dataIndex: 'name',
          scopedSlots: { customRender: 'name' },
          fixed: 'left',
        },
        {
          title: '使用部门',
          align: "center",
          dataIndex: 'useId_dictText',
        },
        {
          title: '中心',
          align: "center",
          dataIndex: 'workCenterId_dictText',
        },
        {
          title: '工区',
          align: "center",
          dataIndex: 'factoryModelId_dictText',
        },
        {
          title: '工段',
          align: "center",
          dataIndex: 'areaId_dictText',
        },
        {
          title: '维护部门',
          align: "center",
          dataIndex: 'manageId_dictText',
        },
        {
          title: '维修班组',
          align: "center",
          dataIndex: 'teamId_dictText',
        },
        {
          title: '设备所属分类',
          align: "center",
          dataIndex: 'equipmentCategoryId_dictText',
        },
        {
          title: '是否生产线设备',
          title: 'ABC标识',
          align: "center",
          dataIndex: 'isLineEquip_dictText',
          dataIndex: 'equipmentImportanceId',
        },
        {
          title: '关键设备标识',
@@ -814,16 +952,110 @@
          dataIndex: 'specificEquipment_dictText',
        },
        {
          title: '统一编码',
          title: '安全配置',
          align: "center",
          dataIndex: 'num',
          scopedSlots: { customRender: 'num' },
          dataIndex: 'securityConfiguration',
        },
        {
          title: '设备名称',
          title: '冷却系统',
          align: "center",
          dataIndex: 'name',
          scopedSlots: { customRender: 'name' },
          dataIndex: 'coolingSystem',
        },
        {
          title: '灭火器',
          align: "center",
          dataIndex: 'fireExtinguisher',
        },
        {
          title: '灭火器有效期',
          align: "center",
          dataIndex: 'fireExtinguisherValidityPeriod',
        },
        {
          title: '操作系统',
          align: "center",
          dataIndex: 'operatingSystem',
        },
        {
          title: '系统',
          align: "center",
          dataIndex: 'system',
        },
        {
          title: '设备端口',
          align: "center",
          dataIndex: 'port',
        },
        {
          title: '坐标数量',
          align: "center",
          dataIndex: 'coordinateNum',
        },
        {
          title: '设备状态',
          align: "center",
          dataIndex: 'equipmentStatus_dictText',
        },
        {
          title: '技术状态',
          align: "center",
          dataIndex: 'technologyStatus_dictText',
          scopedSlots: { customRender: 'technologyStatus' },
        },
        {
          title: '重量',
          align: "center",
          dataIndex: 'equipmentUda3',
        },
        {
          title: '重量计量单位',
          align: "center",
          dataIndex: 'equipmentUda4_dictText',
        },
        {
          title: '功能位置',
          align: "center",
          dataIndex: 'equipmentUda5',
        },
        {
          title: '安装位置',
          align: "center",
          dataIndex: 'equipmentUda2',
        },
        {
          title: '出厂日期',
          align: "center",
          dataIndex: 'leaveFactoryDate',
        },
        {
          title: '立项卡号',
          align: "center",
          dataIndex: 'projectApprovalNo',
        },
        {
          title: '资金来源',
          align: "center",
          dataIndex: 'fundSource',
        },
        {
          title: '验收日期',
          align: "center",
          dataIndex: 'acceptanceCheckDate',
        },
        {
          title: '出厂编号',
          align: "center",
          dataIndex: 'factoryNo',
        },
        {
          title: '资产制造商',
          align: "center",
          dataIndex: 'constructorId_dictText',
        },
        {
          title: '资产的来源国家',
          align: "center",
          dataIndex: 'sourceCountry',
        },
        {
          title: '型号',
@@ -831,7 +1063,7 @@
          dataIndex: 'model',
        },
        {
          title: '规格',
          title: '设备规格',
          align: "center",
          dataIndex: 'specification',
        },
@@ -841,31 +1073,49 @@
          dataIndex: 'gpo',
        },
        {
          title: '使用部门',
          title: '创建人',
          align: "center",
          dataIndex: 'useId_dictText',
          dataIndex: 'createBy'
        },
        // {
        //   title: '维护部门',
        //   align: "center",
        //   dataIndex: 'manageId_dictText',
        // },
        // {
        //   title: '维修班组',
        //   align: "center",
        //   dataIndex: 'teamId_dictText',
        // },
        {
          title: 'ABC标识',
          title: '创建时间',
          align: "center",
          dataIndex: 'equipmentImportanceId',
          dataIndex: 'createTime',
        },

        {
          title: '技术状态',
          title: '更新人',
          align: "center",
          dataIndex: 'technologyStatus_dictText',
          scopedSlots: { customRender: 'technologyStatus' },
          dataIndex: 'updateBy'
        },
        {
          title: '更新时间',
          align: "center",
          dataIndex: 'updateTime',
        },
        {
          title: '质保开始日期',
          align: "center",
          dataIndex: 'warrantyStart'
        },
        {
          title: '质保结束日期',
          align: "center",
          dataIndex: 'warrantyEnd',
        },
        {
          title: '资产状态',
          align: "center",
          dataIndex: 'propertyStatus_dictText',
        },
        {
          title: '三保日期',
          align: "center",
          dataIndex: 'thirdMaintenanceTime',
        },
        {
          title: '技术鉴定日期',
          align: "center",
          dataIndex: 'technologyStatusQualificationTime',
        },
        {
          title: '技术状态鉴定类型',
@@ -878,6 +1128,11 @@
          dataIndex: 'nextTechnologyStatusQualificationTime',
        },
        {
          title: '是否生产线设备',
          align: "center",
          dataIndex: 'isLineEquip_dictText',
        },
        {
          title: '生产线编号',
          align: "center",
          dataIndex: 'lineId_dictText',
@@ -887,103 +1142,6 @@
          align: "center",
          dataIndex: 'isMeta_dictText',
        },
        // {
        //   title: '安全配置',
        //   align: "center",
        //   dataIndex: 'securityConfiguration',
        // },
        // {
        //   title: '冷却系统',
        //   align: "center",
        //   dataIndex: 'coolingSystem',
        // },
        // {
        //   title: '灭火器',
        //   align: "center",
        //   dataIndex: 'fireExtinguisher',
        // },


        // {
        //   title: '操作系统',
        //   align: "center",
        //   dataIndex: 'operatingSystem',
        // },
        // {
        //   title: '系统',
        //   align: "center",
        //   dataIndex: 'system',
        // },
        // {
        //   title: '设备端口',
        //   align: "center",
        //   dataIndex: 'port',
        // },
        // {
        //   title: '坐标数量',
        //   align: "center",
        //   dataIndex: 'coordinateNum',
        // },
        // {
        //   title: '设备状态',
        //   align: "center",
        //   dataIndex: 'equipmentStatus_dictText',
        // },
        // {
        //   title: '重量',
        //   align: "center",
        //   dataIndex: 'equipmentUda3',
        // },
        // {
        //   title: '重量计量单位',
        //   align: "center",
        //   dataIndex: 'equipmentUda4_dictText',
        // },
        // {
        //   title: '功能位置',
        //   align: "center",
        //   dataIndex: 'equipmentUda5',
        // },
        // {
        //   title: '安装位置',
        //   align: "center",
        //   dataIndex: 'equipmentUda2',
        // },
        // {
        //   title: '出厂日期',
        //   align: "center",
        //   dataIndex: 'leaveFactoryDate',
        // },
        // {
        //   title: '立项卡号',
        //   align: "center",
        //   dataIndex: 'projectApprovalNo',
        // },
        // {
        //   title: '资金来源',
        //   align: "center",
        //   dataIndex: 'fundSource',
        // },
        // {
        //   title: '验收日期',
        //   align: "center",
        //   dataIndex: 'acceptanceCheckDate',
        // },
        // {
        //   title: '出厂编号',
        //   align: "center",
        //   dataIndex: 'factoryNo',
        // },
        // {
        //   title: '资产制造商',
        //   align: "center",
        //   dataIndex: 'constructorId_dictText',
        // },
        // {
        //   title: '资产的来源国家',
        //   align: "center",
        //   dataIndex: 'sourceCountry',
        // }, 
        {
          title: '工艺参数管理',
          align: "center",
@@ -1005,6 +1163,24 @@
          title: '精度参数模板',
          align: "center",
          dataIndex: 'precisionParametersTemplateId_dictText',
        },
        {
          title: '有无点检标准',
          align: "center",
          dataIndex: 'yseNoInspectionStandard',
          scopedSlots: { customRender: 'yseNoInspectionStandard' }
        },
        {
          title: '有无二保标准',
          align: "center",
          dataIndex: 'yseNoMaintenance2Standard',
          scopedSlots: { customRender: 'yseNoMaintenance2Standard' }
        },
        {
          title: '有无三保标准',
          align: "center",
          dataIndex: 'yseNoMaintenance3Standard',
          scopedSlots: { customRender: 'yseNoMaintenance3Standard' }
        },
        // {
        //   title: '备注',
@@ -1099,7 +1275,7 @@
      this.selectedMainId = ''
    },
    onSelectChange(selectedRowKeys, selectionRows) {
      if (selectedRowKeys.length == 1) {
      if (selectedRowKeys.length >= 1) {
        this.selectedMainId = selectedRowKeys[0]
        this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
        this.isOpenProcess = selectionRows[0].processParameters == 1;
@@ -1121,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) {
@@ -1264,6 +1443,11 @@
              }
            })
          }
          else {
            this.$message.warning('未查询到有效模板')
          }
        } else {
          this.$message.warning('未查询到有效模板')
        }
      })
    },