From b7e68d833b667aa5d87f58f90ae3c1de063bdfc0 Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期五, 08 九月 2023 16:24:33 +0800 Subject: [PATCH] 设备台账 1.ABC标识变更记录功能 2.质保日期变更记录功能 3.质保到期提醒 4.ABC标识与关键设备标识联动 5.设备质保期字段添加 --- src/views/eam/EquipmentList.vue | 44 ++++++++++++++++++++++++++++++++------------ 1 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/views/eam/EquipmentList.vue b/src/views/eam/EquipmentList.vue index a633527..1ed70db 100644 --- a/src/views/eam/EquipmentList.vue +++ b/src/views/eam/EquipmentList.vue @@ -241,8 +241,9 @@ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-button type="primary" icon="import" v-has="'equipmentAccount:add&delete&import&Edit'">瀵煎叆</a-button> </a-upload> + <a-button :disabled="selectedRowKeys.length==0" @click="handleUpdateABC" type="primary" icon="font-colors" v-has="'equipmentAccount:add&delete&import&Edit'">ABC鏍囪瘑鍙樻洿</a-button> + <a-button :disabled="selectedRowKeys.length==0" @click="handleUpdateWarranty" type="primary" icon="calendar" v-has="'equipmentAccount:add&delete&import&Edit'">璐ㄤ繚鏈熷彉鏇�</a-button> </div> - <!-- table鍖哄煙-begin --> <div> <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> @@ -260,7 +261,7 @@ :dataSource="dataSource" :pagination="ipagination" :loading="loading" - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}" + :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}" :customRow="clickThenSelect" @change="handleTableChange"> @@ -425,22 +426,30 @@ <a-tabs defaultActiveKey="1"> <a-tab-pane tab="宸ヨ壓鍙傛暟" key="1" > <EquipmentProcessParametersList - :mainId="equipmentProcessParametersMainId" + :mainId="selectedMainId" :isOpen="isOpenProcess" /> </a-tab-pane> <a-tab-pane tab="璁惧绮惧害" key="2" forceRender> <EquipmentPrecisionParametersList :isOpen="isOpenPrecision" - :mainId="equipmentPrecisionParametersMainId" /> + :mainId="selectedMainId" /> </a-tab-pane> <a-tab-pane tab="璁惧鏂囨。" key="3" forceRender> - <EquipmentDocumentList :mainId="equipmentDocumentMainId" /> + <EquipmentDocumentList :mainId="selectedMainId" /> + </a-tab-pane> + <a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="4" forceRender> + <equipment-update-ABC-list :mainId="selectedMainId" /> + </a-tab-pane> + <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="5" forceRender> + <equipment-update-warranty-list :mainId="selectedMainId" /> </a-tab-pane> </a-tabs> <equipment-modal ref="modalForm" @ok="modalFormOk"></equipment-modal> <process-edit-model ref ="processEditModel"></process-edit-model> <precision-edit-model ref ="precisionEditModel"></precision-edit-model> + <aBC-update-edit-model @ok="modalFormOk" :updateList="selectionRows" ref="updateABC"></aBC-update-edit-model> + <warranty-update-model :updateList="selectionRows" ref="updateWarranty"></warranty-update-model> </a-card> </template> @@ -457,7 +466,13 @@ import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer' import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue' import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue' - import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel.vue' + import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel' + import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue' + import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue' +import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue' +import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue' + + export default { @@ -472,6 +487,10 @@ JSearchSelectTag, ProcessEditModel, PrecisionEditModel, + EquipmentUpdateABCList , + EquipmentUpdateWarrantyList, + ABCUpdateEditModel, + WarrantyUpdateModel, }, data () { return { @@ -726,6 +745,7 @@ xs: { span: 24 }, sm: { span: 16 }, }, + mainId:'', } }, created() { @@ -761,16 +781,10 @@ }, onSelectChange(selectedRowKeys, selectionRows) { if(selectedRowKeys.length==1){ - this.equipmentProcessParametersMainId = selectionRows[0]['id'] - this.equipmentDocumentMainId = selectionRows[0]['id'] - this.equipmentPrecisionParametersMainId = selectionRows[0]['id'] this.selectedMainId=selectedRowKeys[0] this.isOpenProcess = selectionRows[0].processParameters==1; this.isOpenPrecision = selectionRows[0].precisionParameters==1; }else{ - this.equipmentProcessParametersMainId ='' - this.equipmentDocumentMainId = '' - this.equipmentPrecisionParametersMainId = '' this.selectedMainId='' } this.selectedRowKeys = selectedRowKeys; @@ -874,6 +888,12 @@ } }) }, + handleUpdateABC(){ + this.$refs.updateABC.add(); + }, + handleUpdateWarranty(){ + this.$refs.updateWarranty.add(); + } } } -- Gitblit v1.9.3