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>
@@ -102,7 +106,7 @@

        <!--使用部门-->
        <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>

        <!--安装位置-->
@@ -131,26 +135,21 @@
        </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>
@@ -220,7 +219,6 @@
          },
          {
            title: '使用部门',
            align: 'center',
            dataIndex: 'factoryOrgCode',
            scopedSlots: { customRender: 'factoryOrgCode' }
          },
@@ -418,7 +416,7 @@
            title: '操作',
            dataIndex: 'action',
            align: 'center',
            width: 150,
            width: 200,
            scopedSlots: { customRender: 'action' },
            fixed: 'right'
          }