Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-11 dd882d827e101e85cf1806284d1e3e76d3466ecb

 src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue

@@ -103,7 +103,6 @@
        @click="handleAdd"
        type="primary"
        icon="plus"
        v-if="isShowAuth('eam:secondMaintenance:add')"
      >新增
      </a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -111,7 +110,6 @@
          <a-menu-item
            key="1"
            @click="handlerBatchAbolish"
            v-if="isShowAuth('eam:secondMaintenance:abolish')"
          >
            <a-icon type="delete" />
            作废
@@ -119,7 +117,6 @@
          <a-menu-item
            key="2"
            @click="handlerBatchCollect"
            v-if="isShowAuth('eam:secondMaintenance:collect')"
          >
            <a-icon type="form" />
            领取
@@ -167,31 +164,27 @@
          <template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE'">
            <a
              @click="handleEdit(record)"
              v-if="isShowAuth('eam:thirdMaintenance:edit')"
            >编辑</a>

            <a-divider
              type="vertical"
              v-if="isShowAuth('eam:thirdMaintenance:edit')"
            />

            <a-popconfirm
              title="确定领取吗?"
              @confirm="() => handlerCollect(record.id)"
              v-if="isShowAuth('eam:thirdMaintenance:collect')"
            >
              <a>领取</a>
            </a-popconfirm>

            <a-divider
              type="vertical"
              v-if="isShowAuth('eam:thirdMaintenance:collect')"
            />

            <a-dropdown>
              <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
              <a-menu slot="overlay">
                <a-menu-item v-if="isShowAuth('eam:thirdMaintenance:abolish')">
                <a-menu-item>
                  <a-popconfirm
                    title="确定作废吗?"
                    @confirm="() => handlerAbolish(record.id)"