From a5093e5c0db210a162b5a409d3f330a0f045d90a Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期二, 22 七月 2025 16:59:09 +0800 Subject: [PATCH] 技术状态变更页面设备验收 --- src/views/eam/technical/EamTechnicalStatusChangeList.vue | 38 ++++++++++++++++++++++++++++++-------- 1 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/views/eam/technical/EamTechnicalStatusChangeList.vue b/src/views/eam/technical/EamTechnicalStatusChangeList.vue index 0cbd6cc..cd4a84d 100644 --- a/src/views/eam/technical/EamTechnicalStatusChangeList.vue +++ b/src/views/eam/technical/EamTechnicalStatusChangeList.vue @@ -47,30 +47,37 @@ <!-- table鍖哄煙-begin --> <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"> + :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange" + :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}" + :customRow="customRow"> <span slot="action" slot-scope="text, record"> <template v-if="record.changeStatus=='WAIT_SUBMIT'"> - <a @click="handleEdit(record)">缂栬緫</a> + <a @click.stop="handleEdit(record)">缂栬緫</a> <a-divider type="vertical"/> <a-popconfirm title="纭畾鎻愪氦鍚楋紵" @confirm="handleSubmit(record.id)"> - <a>鎻愪氦</a> + <a @click="e=>e.stopPropagation()">鎻愪氦</a> </a-popconfirm> <a-divider type="vertical"/> <a-popconfirm title="纭畾浣滃簾鍚楋紵" @confirm="handleAbolish(record.id)"> - <a>浣滃簾</a> + <a @click="e=>e.stopPropagation()">浣滃簾</a> </a-popconfirm> </template> - <a @click="handleDetail(record)" + <a @click.stop="handleDetail(record)" v-if="record.changeStatus!='WAIT_SUBMIT'&&record.changeStatus!='ABOLISH'">璇︽儏</a> </span> </a-table> - <!-- table鍖哄煙-end --> + + <a-tabs v-if="selectedRowKeys.length>0"> + <a-tab-pane tab="璁惧鏄庣粏"> + <eam-technical-status-change-equipment-detail :selectedRow="selectionRows[0]"/> + </a-tab-pane> + </a-tabs> <!-- 琛ㄥ崟鍖哄煙 --> <eamTechnicalStatusChange-modal ref="modalForm" @ok="modalFormOk" :productionTreeData="productionTreeData"/> @@ -87,11 +94,13 @@ import { getAction } from '@/api/manage' import TechnicalStatusChangeApprovalModal from '../../flowable/workflow/TechnicalStatus/TechnicalStatusChangeApprovalModal' + import EamTechnicalStatusChangeEquipmentDetail from './modules/EamTechnicalStatusChangeEquipmentDetail' export default { name: 'EamTechnicalStatusChangeList', mixins: [JeecgListMixin], components: { + EamTechnicalStatusChangeEquipmentDetail, TechnicalStatusChangeApprovalModal, EamTechnicalStatusChangeModal }, @@ -133,7 +142,7 @@ { title: '浣跨敤鍗曚綅瀹ょ骇涓荤绛惧瓧', align: 'center', - dataIndex: 'departHeaderSignature' + dataIndex: 'departHeaderSignature_dictText' }, { title: '浣跨敤鍗曚綅瀹ょ骇涓荤绛惧瓧鏃堕棿', @@ -143,7 +152,7 @@ { title: '浣跨敤鍗曚綅閮ㄧ骇涓荤绛惧瓧', align: 'center', - dataIndex: 'departLeaderSignature' + dataIndex: 'departLeaderSignature_dictText' }, { title: '浣跨敤鍗曚綅閮ㄧ骇涓荤绛惧瓧鏃堕棿', @@ -255,6 +264,19 @@ this.$refs.technicalStatusChangeApprovalModal.handleDetail(record) }, + customRow(record) { + return { + style: { + cursor: 'pointer' + }, + on: { + click: event => { + this.onSelectChange([record.id], [record]) + } + } + } + }, + /** * 鐢宠鏃堕棿鍙戠敓鏀瑰彉鏃惰Е鍙� * @param dateStringArray -- Gitblit v1.9.3