From d2547913ef2e150d8bb18bc8f7423515c7ed71d0 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 四月 2025 14:04:29 +0800
Subject: [PATCH] 1、调整设备台账铭牌二维码大小 2、待机停机页面功能开发
---
src/views/eam/equipment/EamEquipmentList.vue | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentList.vue b/src/views/eam/equipment/EamEquipmentList.vue
index f830daa..e136054 100644
--- a/src/views/eam/equipment/EamEquipmentList.vue
+++ b/src/views/eam/equipment/EamEquipmentList.vue
@@ -85,13 +85,13 @@
<a-button type="primary" icon="download" @click="handleTemplateXlsDownload">瀵煎叆妯℃澘涓嬭浇</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel">
- <a-icon type="delete"/>
- 鍒犻櫎
- </a-menu-item>
- <a-menu-item key="2" @click="handleOpenNameplateModal(selectionRows)">
+ <a-menu-item key="1" @click="handleOpenNameplateModal(selectionRows)">
<a-icon type="printer"/>
鎵撳嵃閾墝
+ </a-menu-item>
+ <a-menu-item key="2" @click="batchDel" v-if="isShowAuth('eam:equipment:delete')">
+ <a-icon type="delete"/>
+ 鍒犻櫎
</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
@@ -107,7 +107,6 @@
style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
<a style="margin-left: 24px" @click="onSelectChange([])">娓呯┖</a>
</div>
-
<a-table
ref="table"
size="middle"
@@ -153,7 +152,7 @@
<a-menu-item>
<a href="javascript:;" @click="handleDetail(record)">璇︽儏</a>
</a-menu-item>
- <a-menu-item>
+ <a-menu-item v-if="isShowAuth('eam:equipment:delete')">
<a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
<a>鍒犻櫎</a>
</a-popconfirm>
@@ -167,11 +166,15 @@
<!-- table鍖哄煙-end -->
<a-tabs v-model="activeTabKey" @change="handleTabChange">
- <a-tab-pane tab="璁惧鏂囨。" :key="1">璁惧鏂囨。</a-tab-pane>
+ <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">鍛ㄦ姤宸ュ崟</a-tab-pane>
+ <a-tab-pane tab="鍛ㄤ繚宸ュ崟" :key="3">
+ <eam-week-maintenance-order-list ref="tabPaneTableListRef3" :isDisplayOperation="false"/>
+ </a-tab-pane>
<a-tab-pane tab="缁翠慨宸ュ崟" :key="4">
<eam-repair-order-list ref="tabPaneTableListRef4" :isDisplayOperation="false"/>
</a-tab-pane>
@@ -185,7 +188,7 @@
<!--閾墝寮圭獥-->
<nameplate-modal ref="nameplateModalRef" :printedRows="printedRows"/>
<!--灞ュ巻寮圭獥-->
- <resume-drawer ref="resumeDrawerRef"/>
+ <resume-drawer ref="resumeDrawerRef" :currentTableRowRecord="currentTableRowRecord"/>
</a-card>
</template>
@@ -200,6 +203,8 @@
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 EamWeekMaintenanceOrderList from '@views/eam/maintenance/EamWeekMaintenanceOrderList.vue'
export default {
name: 'EamEquipmentList',
@@ -210,7 +215,9 @@
EamMaintenanceStandardList,
ResumeDrawer,
NameplateModal,
- EamEquipmentModal
+ EamEquipmentModal,
+ EamEquipmentAttachmentList,
+ EamWeekMaintenanceOrderList
},
data() {
return {
@@ -297,7 +304,6 @@
{
title: '璁惧鍒嗙被',
align: 'center',
- width: 100,
dataIndex: 'equipmentCategory_dictText'
},
{
@@ -330,23 +336,20 @@
width: 100,
dataIndex: 'installationPosition'
},
-
{
title: '绔嬮」鍗″彿',
align: 'center',
- width: 100,
dataIndex: 'cardNumber'
},
{
title: '鍑哄巶缂栧彿',
align: 'center',
- width: 100,
dataIndex: 'factoryNumber'
},
{
title: '鏈哄簥鍘傚',
align: 'center',
- width: 100,
+ width: 300,
dataIndex: 'manufacturingEnterprise'
},
{
@@ -415,23 +418,23 @@
{
title: '璁惧绔彛',
align: 'center',
- width: 100,
dataIndex: 'equipmentPort'
},
{
title: '鍧愭爣鏁伴噺',
align: 'center',
- width: 100,
dataIndex: 'coordinateNum'
},
{
title: '鍒涘缓浜�',
align: 'center',
+ width: 100,
dataIndex: 'createBy_dictText'
},
{
title: '鍒涘缓鏃堕棿',
align: 'center',
+ width: 200,
dataIndex: 'createTime'
},
{
@@ -447,7 +450,6 @@
{
title: '澶囨敞',
align: 'center',
- width: 100,
dataIndex: 'remark'
},
{
@@ -471,7 +473,8 @@
treeData: [],
printedRows: [],
activeTabKey: 1,
- appHomeUrl: ''
+ appHomeUrl: '',
+ currentTableRowRecord: {}
}
},
computed: {
@@ -510,7 +513,11 @@
* @param record 琛ㄦ牸琛屼俊鎭�
*/
handleOpenResumeDrawer(record) {
+ this.currentTableRowRecord = Object.assign({}, record)
+ this.$refs.resumeDrawerRef.title = '璁惧灞ュ巻' + `锛�${record.equipmentCode}锛塦
+ this.$refs.resumeDrawerRef.dataSource = []
this.$refs.resumeDrawerRef.visible = true
+ this.$nextTick(() => this.$refs.resumeDrawerRef.getEquipmentResumeByApi())
},
/**
@@ -557,6 +564,7 @@
onSelectChange(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows
+ this.$refs['tabPaneTableListRef' + this.activeTabKey].queryParam.equipmentId = null
this.$refs['tabPaneTableListRef' + this.activeTabKey].dataSource = []
this.$refs['tabPaneTableListRef' + this.activeTabKey].onClearSelected()
if (selectedRowKeys.length === 1) this.loadTabPaneTableData(selectedRowKeys[0])
--
Gitblit v1.9.3