From c82ac973f3ebf35a9c595259706090cf73610283 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 02 六月 2025 08:45:33 +0800
Subject: [PATCH] art: 设备管理-安装位置信息
---
src/views/eam/repair/EamRepairOrderList.vue | 159 ++++++++++++++++++----------------------------------
1 files changed, 55 insertions(+), 104 deletions(-)
diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue
index d905fc3..57d877a 100644
--- a/src/views/eam/repair/EamRepairOrderList.vue
+++ b/src/views/eam/repair/EamRepairOrderList.vue
@@ -17,8 +17,8 @@
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鍗曟嵁鐘舵��">
- <a-select placeholder="璇烽�夋嫨鍗曟嵁鐘舵��" v-model="queryParam.repairStatus" allow-clear>
+ <a-form-item label="缁翠慨鐘舵��">
+ <a-select placeholder="璇烽�夋嫨缁翠慨鐘舵��" v-model="queryParam.repairStatus" allow-clear>
<a-select-option v-for="item in report_repair_status_list" :key="item.value">{{ item.label }}
</a-select-option>
</a-select>
@@ -44,8 +44,8 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<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 @click="handleOpenReceiveFaultModal" type="primary" icon="plus" v-if="isShowAuth('eam:repair:collect')">棰嗗彇</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">
@@ -81,34 +81,16 @@
@change="handleTableChange"
:scroll="{x:'max-content'}"
>
-
<span slot="action" slot-scope="text, record">
- <a @click="handleOpenApplySparePartsModal(record)">鐢宠澶囦欢</a>
-
- <a-divider type="vertical"/>
-
- <a @click="handleOpenRepairCompletedModal(record)">瀹屾垚缁翠慨</a>
-
- <!--<a @click="handleEdit(record)">缂栬緫</a>-->
-
- <!--<a-divider type="vertical"/>-->
- <!--<a-dropdown>-->
- <!--<a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a>-->
- <!--<a-menu slot="overlay">-->
- <!--<a-menu-item>-->
- <!--<a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">-->
- <!--<a>鍒犻櫎</a>-->
- <!--</a-popconfirm>-->
- <!--</a-menu-item>-->
- <!--</a-menu>-->
- <!--</a-dropdown>-->
+ <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>
@@ -118,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() {
@@ -139,100 +123,69 @@
// 琛ㄥご
columns: [
{
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ },
+ },
+ {
title: '宸ュ崟缂栧彿',
align: 'center',
dataIndex: 'repairCode',
- width: 200,
- fixed: 'left'
},
- // {
- // title: '鎶ヤ慨缂栧彿',
- // align: 'center',
- // dataIndex: 'reportId',
- // width: 200,
- // fixed: 'left'
- // },
{
title: '璁惧缂栧彿',
align: 'center',
- dataIndex: 'equipmentId_dictText',
- width: 200,
- fixed: 'left'
+ dataIndex: 'equipmentCode',
},
{
- title: '鐘舵��',
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'equipmentName',
+ },
+ {
+ title: '瀹夎浣嶇疆',
+ align: 'center',
+ dataIndex: 'installationPosition',
+ },
+ {
+ title: '缁翠慨鐘舵��',
align: 'center',
dataIndex: 'repairStatus_dictText',
- fixed: 'left',
- width: 100
+ },
+ {
+ title: '缁翠慨璐熻矗浜�',
+ align: 'center',
+ dataIndex: 'repairer',
},
{
title: '缁翠慨寮�濮嬫椂闂�',
align: 'center',
dataIndex: 'actualStartTime',
- width: 200
},
{
title: '缁翠慨缁撴潫鏃堕棿',
align: 'center',
dataIndex: 'actualEndTime',
- width: 200
},
{
title: '鏁呴殰鍘熷洜',
align: 'center',
- dataIndex: 'faultReason',
- width: 150
+ dataIndex: 'faultReason'
},
{
title: '缁翠慨缁撴灉鎻忚堪',
align: 'center',
- dataIndex: 'repairDescription',
- width: 300
- },
- {
- title: '缁翠慨鍥剧墖',
- align: 'center',
- dataIndex: 'imageFiles',
- width: 100
- },
- {
- title: '缁翠慨璐熻矗浜�',
- align: 'center',
- dataIndex: 'repairer'
- },
- // {
- // title: '鏄惁濮斿',
- // align: 'center',
- // dataIndex: 'outsourcedFlag',
- // width: 100
- // },
- // {
- // title: '濮斿缁翠慨鎻忚堪',
- // align: 'center',
- // dataIndex: 'outsourcedRepairDecription',
- // width: 300
- // },
- // {
- // title: '濮斿缁翠慨寮�濮嬫椂闂�',
- // align: 'center',
- // dataIndex: 'outsourcedStartTime',
- // width: 200
- // },
- // {
- // title: '濮斿缁翠慨缁撴潫鏃堕棿',
- // align: 'center',
- // dataIndex: 'outsourcedEndTime',
- // width: 200
- // },
- // {
- // title: '濮斿璐熻矗浜�',
- // align: 'center',
- // dataIndex: 'outsourcedPerson',
- // width: 100
- // },
+ dataIndex: 'repairDescription'
+ // width: 300
+ }
],
report_repair_status_list: [],
+ selectRepairOrderData: {},
url: {
list: '/eam/eamRepairOrder/list',
delete: '/eam/eamRepairOrder/delete',
@@ -255,6 +208,8 @@
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
+ width: 100,
+ fixed: 'right',
scopedSlots: { customRender: 'action' }
}
this.columns = [...this.columns, operationColumn]
@@ -283,23 +238,19 @@
// 寮�鍚鍙栨晠闅滀繚淇崟寮圭獥
handleOpenReceiveFaultModal() {
this.$refs.receiveFaultModalRef.visible = true
- this.$refs.receiveFaultModalRef.loadData()
},
/**
- * 寮�鍚敵璇峰浠跺脊绐�
+ * 鐐瑰嚮璇︽儏瑙﹀彂
* @param record 琛ㄦ牸琛屼俊鎭�
*/
- handleOpenApplySparePartsModal(record) {
-
- },
-
- /**
- * 寮�鍚畬鎴愮淮淇脊绐�
- * @param record 琛ㄦ牸琛屼俊鎭�
- */
- handleOpenRepairCompletedModal(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 })
}
}
}
--
Gitblit v1.9.3