From 2637821cb7466330f5c612be809531cb65790219 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 04 七月 2025 20:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/equipment/EamEquipmentLedger.vue | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue
index ac6cb61..79d620d 100644
--- a/src/views/eam/equipment/EamEquipmentLedger.vue
+++ b/src/views/eam/equipment/EamEquipmentLedger.vue
@@ -92,19 +92,9 @@
style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
<a style="margin-left: 24px" @click="onSelectChange([])">娓呯┖</a>
</div>
- <a-table
- ref="table"
- size="middle"
- bordered
- rowKey="id"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- :loading="loading"
- :scroll="{ x: 'max-content' }"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- @change="handleTableChange"
- >
+ <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
+ :pagination="ipagination" :loading="loading" :scroll="{ x: 'max-content' }"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange">
<!--缁熶竴缂栫爜-->
<template slot="equipmentCode" slot-scope="text">
<a href="#" @click="handleDetail(record)" style="display: inline-block;height: 100%">{{text}}</a>
@@ -139,6 +129,7 @@
<a @click.stop="handleEdit(record)">缂栬緫</a>
<a-divider type="vertical"/>
+
<a-dropdown>
<a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a>
<a-menu slot="overlay">
@@ -298,7 +289,7 @@
{
title: '缁翠慨鐝粍',
align: 'center',
- dataIndex: 'repairDepartOrgCode'
+ dataIndex: 'repairDepartOrgCode_dictText'
},
{
title: '瀹夊叏閰嶇疆',
@@ -441,7 +432,7 @@
dataIndex: 'nextThirdMaintenance'
},
{
- title: '涓変繚鍛ㄦ湡',
+ title: '涓変繚鍛ㄦ湡锛堝勾锛�',
align: 'center',
dataIndex: 'thirdMaintenancePeriod'
},
@@ -456,7 +447,7 @@
dataIndex: 'nextTechnologyCheck'
},
{
- title: '鎶�鏈壌瀹氬懆鏈�',
+ title: '鎶�鏈壌瀹氬懆鏈燂紙骞达級',
align: 'center',
dataIndex: 'technologyCheckPeriod'
},
@@ -541,7 +532,4 @@
}
}
}
-</script>
-<style scoped>
- @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
--
Gitblit v1.9.3