From 9219b0c4d7aecd6347a120ae0923ee5a6a25da05 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 23 四月 2025 10:34:18 +0800
Subject: [PATCH] 1、我的待办页面 设备维修 分类审批弹窗功能逻辑开发并复用至我的已办和维修工单页面 2、根据会议内容调整系统功能 3、调整设备铭牌打印高度
---
src/views/eam/repair/EamRepairOrderList.vue | 69 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 24 deletions(-)
diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue
index 4da6b7c..5d01fd4 100644
--- a/src/views/eam/repair/EamRepairOrderList.vue
+++ b/src/views/eam/repair/EamRepairOrderList.vue
@@ -45,7 +45,7 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator" v-if="isDisplayOperation">
<a-button @click="handleOpenReceiveFaultModal" type="primary" icon="plus">棰嗗彇</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('缁翠慨宸ュ崟')">瀵煎嚭</a-button>
+ <!--<a-button type="primary" icon="download" @click="handleExportXls('缁翠慨宸ュ崟')">瀵煎嚭</a-button>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel">
@@ -80,11 +80,17 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"
:scroll="{x:'max-content'}"
- />
+ >
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleDetail(record)">璇︽儏</a>
+ </span>
+ </a-table>
</div>
<!-- table鍖哄煙-end -->
<receive-fault-modal ref="receiveFaultModalRef" @ok="loadData"/>
+
+ <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData"/>
</a-card>
</template>
@@ -94,18 +100,20 @@
import ReceiveFaultModal from './modules/EamRepairOrderList/ReceiveFaultModal'
import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
+ import RepairOrderApprovalModal from '../../flowable/workflow/repairOrder/RepairOrderApprovalModal'
export default {
name: 'EamRepairOrderList',
mixins: [JeecgListMixin],
components: {
+ RepairOrderApprovalModal,
LxSearchEquipmentSelect,
ReceiveFaultModal
},
- props:{
- isDisplayOperation:{
- type:Boolean,
- default:true
+ props: {
+ isDisplayOperation: {
+ type: Boolean,
+ default: true
}
},
data() {
@@ -163,22 +171,20 @@
{
title: '鏁呴殰鍘熷洜',
align: 'center',
- dataIndex: 'faultReason',
- width: 150
+ dataIndex: 'faultReason'
},
{
title: '缁翠慨缁撴灉鎻忚堪',
align: 'center',
- dataIndex: 'repairDescription',
+ dataIndex: 'repairDescription'
// width: 300
- },
- {
- title: '缁翠慨鍥剧墖',
- align: 'center',
- dataIndex: 'imageFiles',
- width: 100
- },
-
+ }
+ // {
+ // title: '缁翠慨鍥剧墖',
+ // align: 'center',
+ // dataIndex: 'imageFiles',
+ // width: 100
+ // },
// {
// title: '鏄惁濮斿',
// align: 'center',
@@ -211,6 +217,7 @@
// },
],
report_repair_status_list: [],
+ selectRepairOrderData: {},
url: {
list: '/eam/eamRepairOrder/list',
delete: '/eam/eamRepairOrder/delete',
@@ -229,13 +236,14 @@
return
}
this.initDictData('report_repair_status')
- // const operationColumn = {
- // title: '鎿嶄綔',
- // dataIndex: 'action',
- // align: 'center',
- // scopedSlots: { customRender: 'action' }
- // }
- // this.columns = [...this.columns, operationColumn]
+ const operationColumn = {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: 'center',
+ width: 100,
+ scopedSlots: { customRender: 'action' }
+ }
+ this.columns = [...this.columns, operationColumn]
this.loadData(1)
},
methods: {
@@ -262,6 +270,19 @@
handleOpenReceiveFaultModal() {
this.$refs.receiveFaultModalRef.visible = true
},
+
+ /**
+ * 鐐瑰嚮璇︽儏瑙﹀彂
+ * @param record 琛ㄦ牸琛屼俊鎭�
+ */
+ handleDetail(record) {
+ this.selectRepairOrderData = Object.assign({}, record)
+ this.$refs.repairOrderApprovalModal.visible = true
+ this.$refs.repairOrderApprovalModal.title = '璇︽儏'
+ this.$refs.repairOrderApprovalModal.disableSubmit = true
+ this.$refs.repairOrderApprovalModal.getAllApproveData(record)
+ this.$refs.repairOrderApprovalModal.getBasicInformation({ ...record, dataId: record.id })
+ }
}
}
</script>
--
Gitblit v1.9.3