From dbb3445dc720a8f36b3424e73f2e02a6b0f9deb6 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期日, 27 四月 2025 11:31:57 +0800 Subject: [PATCH] art: 从沃克项目迁移设备管理代码到航宇 --- src/views/eam/repair/EamRepairOrderList.vue | 90 ++++++++++++++++++--------------------------- 1 files changed, 36 insertions(+), 54 deletions(-) diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue index d905fc3..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"> @@ -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() { @@ -167,6 +151,12 @@ width: 100 }, { + title: '缁翠慨璐熻矗浜�', + align: 'center', + dataIndex: 'repairer', + width: 100 + }, + { title: '缁翠慨寮�濮嬫椂闂�', align: 'center', dataIndex: 'actualStartTime', @@ -181,26 +171,20 @@ { 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' - }, + dataIndex: 'repairDescription' + // width: 300 + } + // { + // title: '缁翠慨鍥剧墖', + // align: 'center', + // dataIndex: 'imageFiles', + // width: 100 + // }, // { // title: '鏄惁濮斿', // align: 'center', @@ -233,6 +217,7 @@ // }, ], report_repair_status_list: [], + selectRepairOrderData: {}, url: { list: '/eam/eamRepairOrder/list', delete: '/eam/eamRepairOrder/delete', @@ -255,6 +240,7 @@ title: '鎿嶄綔', dataIndex: 'action', align: 'center', + width: 100, scopedSlots: { customRender: 'action' } } this.columns = [...this.columns, operationColumn] @@ -283,23 +269,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