Merge remote-tracking branch 'origin/master'

zhaowei

2025-07-25 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946

 src/views/eam/equipment/EamEquipmentLedger.vue

@@ -65,16 +65,20 @@

    <!-- 操作按钮区域 -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('设备台账')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
      <a-button v-has="'eam:equipment:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button v-has="'eam:equipment:export'" type="primary" icon="download" @click="handleExportXls('设备台账')">导出
      </a-button>
      <a-upload v-has="'eam:equipment:import'" name="file" :showUploadList="false" :multiple="false"
                :headers="tokenHeader" :action="importExcelUrl"
                @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
      <a-button type="primary" icon="download" @click="handleTemplateXlsDownload">导入模板下载</a-button>
      <a-button v-has="'eam:equipment:download'" type="primary" icon="download" @click="handleTemplateXlsDownload">
        导入模板下载
      </a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="2" @click="batchDel">
          <a-menu-item v-has="'eam:equipment:batchdel'" key="2" @click="batchDel">
            <a-icon type="delete"/>
            删除
          </a-menu-item>
@@ -96,13 +100,13 @@
               :pagination="ipagination" :loading="loading" :scroll="{ x: 'max-content' }"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange">
        <!--统一编码-->
        <template slot="equipmentCode" slot-scope="text">
        <template slot="equipmentCode" slot-scope="text,record">
          <a href="#" @click="handleDetail(record)" style="display: inline-block;height: 100%">{{text}}</a>
        </template>

        <!--使用部门-->
        <template slot="factoryOrgCode" slot-scope="text,record">
          {{[record.gsfactoryOrgCode_dictText,record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}}
          {{[record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}}
        </template>

        <!--安装位置-->
@@ -115,8 +119,13 @@
          <a-switch checked-children="是" un-checked-children="否" :checked="Boolean(+text)" disabled/>
        </template>

        <!--操作系统-->
        <!--灭火器-->
        <template slot="fireExtinguisher" slot-scope="text">
          <a-switch checked-children="是" un-checked-children="否" :checked="Boolean(+text)" disabled/>
        </template>

        <!--真空热处理炉-->
        <template slot="trueHeatTreatment" slot-scope="text">
          <a-switch checked-children="是" un-checked-children="否" :checked="Boolean(+text)" disabled/>
        </template>

@@ -126,59 +135,26 @@
        </template>

        <span slot="action" slot-scope="text, record">
          <a @click.stop="handleEdit(record)">编辑</a>
          <a v-has="'eam:equipment:edit'" @click.stop="handleEdit(record)">编辑</a>

          <a-divider type="vertical"/>
          <a-divider v-has="'eam:equipment:edit'" type="vertical"/>

          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a href="javascript:;" @click="handleOpenResumeDrawer(record)">履历</a>
              </a-menu-item>
              <a-menu-item>
                <a href="javascript:;" @click="handleDetail(record)">详情</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
          <a v-has="'eam:equipment:resume'" href="javascript:;" @click="handleOpenResumeDrawer(record)">履历</a>

          <a-divider v-has="'eam:equipment:resume'" type="vertical"/>

          <a-popconfirm v-has="'eam:equipment:del'" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
            <a>删除</a>
          </a-popconfirm>

          <a-divider v-has="'eam:equipment:del'" type="vertical"/>

          <a href="javascript:;" @click="handleDetail(record)">详情</a>
        </span>

      </a-table>
    </div>
    <!-- table区域-end -->

    <!--<a-tabs v-model="activeTabKey" @change="handleTabChange">-->
    <!--<a-tab-pane tab="设备文档" :key="1">-->
    <!--<eam-equipment-attachment-list ref="tabPaneTableListRef1"/>-->
    <!--</a-tab-pane>-->
    <!--<a-tab-pane tab="点检工单" :key="2">-->
    <!--<eam-inspection-order-list ref="tabPaneTableListRef2" :isDisplayOperation="false"/>-->
    <!--</a-tab-pane>-->
    <!--<a-tab-pane tab="二保工单" :key="3">-->
    <!--<eam-second-maintenance-order-list ref="tabPaneTableListRef3" :isDisplayOperation="false"/>-->
    <!--</a-tab-pane>-->
    <!--<a-tab-pane tab="三保工单" :key="4">-->
    <!--<eam-third-maintenance-order-list ref="tabPaneTableListRef4" :isDisplayOperation="false"/>-->
    <!--</a-tab-pane>-->
    <!--<a-tab-pane tab="维修工单" :key="5">-->
    <!--<eam-repair-order-list ref="tabPaneTableListRef5" :isDisplayOperation="false"/>-->
    <!--</a-tab-pane>-->
    <!--<a-tab-pane tab="保养标准" :key="6">-->
    <!--<eam-maintenance-standard-list ref="tabPaneTableListRef6" :isDisplayOperation="false"/>-->
    <!--</a-tab-pane>-->
    <!--<a-tab-pane tab="工艺参数" :key="7" v-if="isOpenProcess">-->
    <!--<eam-equipment-process-list ref="tabPaneTableListRef7" :isDisplayOperation="false"/>-->
    <!--</a-tab-pane>-->
    <!--<a-tab-pane tab="设备精度" :key="8" v-if="isOpenPrecision">-->
    <!--<eam-equipment-precision-list ref="tabPaneTableListRef8" :isDisplayOperation="false"/>-->
    <!--</a-tab-pane>-->
    <!--</a-tabs>-->

    <!-- 表单区域 -->
    <eamEquipment-modal ref="modalForm" @ok="modalFormOk" :productionTreeData="productionTreeData"
                        :repairDepartTreeData="repairDepartTreeData"/>
@@ -191,31 +167,14 @@
  import EamEquipmentModal from './modules/EamEquipmentModal.vue'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import { getAction, templateXlsDownload } from '@api/manage'
  import { getSystemConfigValue } from '@api/api'
  import ResumeDrawer from '@views/eam/equipment/modules/ResumeDrawer.vue'
  import EamMaintenanceStandardList from '@views/eam/base/EamMaintenanceStandardList.vue'
  import EamRepairOrderList from '../repair/EamRepairOrderList'
  import EamInspectionOrderList from '../maintenance/EamInspectionOrderList'
  import EamEquipmentAttachmentList from '@views/eam/equipment/EamEquipmentAttachmentList.vue'
  import EamEquipmentProcessList from '@views/eam/equipment/modules/EamEquipmentProcessList.vue'
  import EamEquipmentPrecisionList from '@views/eam/equipment/modules/EamEquipmentPrecisionList.vue'
  import EamSecondMaintenanceOrderList from '@views/eam/maintenance/EamSecondMaintenanceOrderList.vue'
  import EamThirdMaintenanceOrderList from '@views/eam/maintenance/EamThirdMaintenanceOrderList.vue'

  export default {
    name: 'EquipmentLedger',
    mixins: [JeecgListMixin],
    components: {
      EamInspectionOrderList,
      EamRepairOrderList,
      EamMaintenanceStandardList,
      ResumeDrawer,
      EamEquipmentModal,
      EamEquipmentAttachmentList,
      EamEquipmentProcessList,
      EamEquipmentPrecisionList,
      EamSecondMaintenanceOrderList,
      EamThirdMaintenanceOrderList
      EamEquipmentModal
    },
    data() {
      return {
@@ -244,20 +203,22 @@
            align: 'center',
            dataIndex: 'equipmentCode',
            scopedSlots: { customRender: 'equipmentCode' },
            ellipsis: true,
            fixed: 'left',
            sorter: true
            fixed: 'left'
          },
          {
            title: '设备名称',
            align: 'center',
            dataIndex: 'equipmentName',
            ellipsis: true,
            fixed: 'left'
          },
          {
            title: '型号',
            align: 'center',
            dataIndex: 'equipmentModel',
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            dataIndex: 'factoryOrgCode',
            scopedSlots: { customRender: 'factoryOrgCode' }
          },
@@ -324,6 +285,12 @@
            dataIndex: 'system'
          },
          {
            title: '真空热处理炉',
            align: 'center',
            dataIndex: 'trueHeatTreatment',
            scopedSlots: { customRender: 'trueHeatTreatment' }
          },
          {
            title: '设备端口',
            align: 'center',
            dataIndex: 'equipmentPort'
@@ -383,18 +350,12 @@
            title: '资产制造商',
            align: 'center',
            dataIndex: 'manufacturingEnterprise',
            scopedSlots: { customRender: 'manufacturingEnterprise' },
            ellipsis: true
            scopedSlots: { customRender: 'manufacturingEnterprise' }
          },
          {
            title: '资产来源国家',
            align: 'center',
            dataIndex: 'originCountry'
          },
          {
            title: '型号',
            align: 'center',
            dataIndex: 'equipmentModel'
          },
          {
            title: '设备规格',
@@ -455,7 +416,7 @@
            title: '操作',
            dataIndex: 'action',
            align: 'center',
            width: 150,
            width: 200,
            scopedSlots: { customRender: 'action' },
            fixed: 'right'
          }
@@ -468,7 +429,7 @@
          importExcelUrl: 'eam/equipment/importExcel',
          getProductionTreeList: '/eam/BaseFactory/queryTreeList',
          repairDepartTreeList: '/eam/eamBaseRepairDepart/queryTreeList',
          templateXlsDownloadUrl: '导入模板/设备台账导入模板_v1.1.xlsx'
          templateXlsDownloadUrl: '导入模板/设备台账导入模板.xls'
        },
        currentTableRowRecord: {},
        productionTreeData: [],