From 967cbe1cec62829fb399e4c171e22bc531081e77 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 04 九月 2025 15:16:04 +0800
Subject: [PATCH] 设备管理技术状态鉴定、设备保养、设备维修下所有列表添加使用部门展示
---
src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue | 86 ++++++++++++++++++++++++-------------------
1 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue b/src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue
index 3202893..6d2edae 100644
--- a/src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue
+++ b/src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue
@@ -40,8 +40,14 @@
<a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
:pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
@change="handleTableChange">
+
+ <!--浣跨敤閮ㄩ棬-->
+ <template slot="factoryCode" slot-scope="text,record">
+ {{[record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryCode_dictText].filter(item=>item).join('/')}}
+ </template>
+
<span slot="action" slot-scope="text, record">
- <tamplate v-if="record.changeStatus=='WAIT_SUBMIT'">
+ <template v-if="record.changeStatus=='WAIT_SUBMIT'">
<a @click="handleEdit(record)">缂栬緫</a>
<a-divider type="vertical"/>
@@ -55,41 +61,38 @@
<a-popconfirm title="纭畾浣滃簾鍚楋紵" @confirm="handleAbolish(record.id)">
<a>浣滃簾</a>
</a-popconfirm>
- </tamplate>
+ </template>
- <a @click="handleDetail(record)" v-if="record.changeStatus!='WAIT_SUBMIT'&&record.changeStatus!='ABOLISH'">璇︽儏</a>
+ <a @click="handleDetail(record)"
+ v-if="record.changeStatus!='WAIT_SUBMIT'&&record.changeStatus!='ABOLISH'">璇︽儏</a>
</span>
</a-table>
<!-- table鍖哄煙-end -->
<!-- 琛ㄥ崟鍖哄煙 -->
- <eam-third-maintenance-change-modal ref="orderChangeModal" @ok="modalFormOk"/>
+ <eam-third-maintenance-change-modal ref="modalForm" @ok="modalFormOk"/>
- <!--鍙樻洿娴佺▼琛ㄥ崟-->
-<!-- <third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal"-->
-<!-- :selectShenpiData="selectThirdMaintenanceData"/>-->
-
+ <!--瀹℃壒绐楀彛-->
+ <third-maintenance-order-change-approval-modal ref="thirdMaintenanceOrderChangeApprovalModal"
+ :selectShenpiData="selectedRowData"/>
</a-card>
</template>
<script>
- // import EamThirdMaintenanceOrderModal from './modules/EamThirdMaintenanceOrderModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
import { deleteAction, getAction } from '@api/manage'
- // import ThirdMaintenanceApprovalModal
- // from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
- import EamThirdMaintenanceChangeModal
- from '@views/eam/technical/modules/EamThirdMaintenanceChangeModal.vue'
+ import EamThirdMaintenanceChangeModal from './modules/EamThirdMaintenanceChangeModal.vue'
+ import ThirdMaintenanceOrderChangeApprovalModal
+ from '../../flowable/workflow/thirdMaintenance/ThirdMaintenanceOrderChangeApprovalModal'
export default {
name: 'EamThirdMaintenanceChangeList',
mixins: [JeecgListMixin],
components: {
+ ThirdMaintenanceOrderChangeApprovalModal,
EamThirdMaintenanceChangeModal,
- LxSearchEquipmentSelect,
- // EamThirdMaintenanceOrderModal,
- // ThirdMaintenanceApprovalModal
+ LxSearchEquipmentSelect
},
props: {
isDisplayOperation: {
@@ -101,7 +104,7 @@
return {
description: '璁惧涓夌骇淇濆吇鍙樻洿椤甸潰',
disableMixinCreated: true,
- selectThirdMaintenanceData: {},
+ selectedRowData: {},
// 琛ㄥご
columns: [
{
@@ -134,9 +137,21 @@
fixed: 'left'
},
{
+ title: '浣跨敤閮ㄩ棬',
+ dataIndex: 'factoryCode',
+ scopedSlots: { customRender: 'factoryCode' },
+ fixed: 'left'
+ },
+ {
+ title: '鍙樻洿鐘舵��',
+ align: 'center',
+ dataIndex: 'changeStatus_dictText',
+ fixed: 'left'
+ },
+ {
title: '宸ュ崟鍙�',
align: 'center',
- dataIndex: 'orderNum_dictText'
+ dataIndex: 'orderId_dictText'
},
{
title: '鍙樻洿鍗曞彿',
@@ -162,11 +177,6 @@
title: '鐢宠绫诲瀷',
align: 'center',
dataIndex: 'applyCategory_dictText'
- },
- {
- title: '鍙樻洿鐘舵��',
- align: 'center',
- dataIndex: 'changeStatus_dictText'
},
{
title: '鍙樻洿鍘熷洜绫诲瀷',
@@ -221,8 +231,8 @@
],
url: {
list: '/eam/eamThirdMaintenanceChange/list',
- abolish: '/eam/eamThirdMaintenanceChange/abolish',
- collect: '/eam/eamThirdMaintenanceChange/collect'
+ submit: '/eam/eamThirdMaintenanceChange/submit',
+ abolish: '/eam/eamThirdMaintenanceChange/abolish'
}
}
},
@@ -234,13 +244,13 @@
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
+ width: 200,
fixed: 'right',
scopedSlots: { customRender: 'action' }
}
this.columns = [...this.columns, operationColumn]
this.loadData(1)
},
- computed: {},
methods: {
/**
* 鎻愪氦鏃惰Е鍙�
@@ -257,12 +267,12 @@
description: res.message
})
that.loadData()
- that.loading = false
} else {
that.$notification.warning({
message: '娑堟伅',
description: res.message
})
+ that.loading = false
}
})
},
@@ -292,17 +302,17 @@
})
},
- // /**
- // * 鐐瑰嚮璇︽儏鏃惰Е鍙�
- // * @param record
- // */
- // handleDetail(record) {
- // this.selectThirdMaintenanceData = Object.assign({}, record)
- // this.$refs.thirdMaintenanceApprovalModal.title = '璇︽儏'
- // this.$refs.thirdMaintenanceApprovalModal.visible = true
- // this.$refs.thirdMaintenanceApprovalModal.disableSubmit = true
- // this.$refs.thirdMaintenanceApprovalModal.recordDetail(record)
- // },
+ /**
+ * 鐐瑰嚮璇︽儏鏃惰Е鍙�
+ * @param record
+ */
+ handleDetail(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.title = '璇︽儏'
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.visible = true
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.disableSubmit = true
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.handleDetail(record)
+ },
/**
* 鐢宠鏃堕棿鍙戠敓鏀瑰彉鏃惰Е鍙�
--
Gitblit v1.9.3