From c182a210e2e5ab812e104c63c2fbb1a16e91afae Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 05 九月 2025 17:48:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/equipment/EamEquipmentLedger.vue | 62 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue
index 8958c11..acf101c 100644
--- a/src/views/eam/equipment/EamEquipmentLedger.vue
+++ b/src/views/eam/equipment/EamEquipmentLedger.vue
@@ -66,12 +66,16 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<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"
+ <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 v-has="'eam:equipment:download'" 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 v-has="'eam:equipment:batchdel'" key="2" @click="batchDel">
@@ -131,26 +135,21 @@
</template>
<span slot="action" slot-scope="text, record">
- <a v-has="'eam:equipment:edit'" key="2" @click.stop="handleEdit(record)">缂栬緫</a>
+ <a v-has="'eam:equipment:edit'" @click.stop="handleEdit(record)">缂栬緫</a>
<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 v-has="'eam:equipment:resume'" 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 v-has="'eam:equipment:del'" 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>
@@ -221,7 +220,9 @@
{
title: '浣跨敤閮ㄩ棬',
dataIndex: 'factoryOrgCode',
- scopedSlots: { customRender: 'factoryOrgCode' }
+ scopedSlots: { customRender: 'factoryOrgCode' },
+ headerAlign: 'center',
+ align: 'left'
},
{
title: '鎵�灞炲垎绫�',
@@ -417,7 +418,7 @@
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
- width: 150,
+ width: 200,
scopedSlots: { customRender: 'action' },
fixed: 'right'
}
@@ -494,4 +495,19 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
+
+<style scoped lang="less">
+
+/* 琛ㄥご鍏ㄩ儴灞呬腑 */
+::v-deep .ant-table-thead > tr > th {
+ text-align: center !important;
+}
+
+
+/* 琛ㄤ綋锛氬乏瀵归綈 */
+::v-deep .ant-table-tbody > tr > td[data-col="factoryOrgCode"] {
+ text-align: left !important;
+}
+
+</style>
\ No newline at end of file
--
Gitblit v1.9.3