From 3457909638c660c0cfcb521b6104ab64c679b914 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 19 九月 2023 16:23:16 +0800
Subject: [PATCH] 修改页面左右展示比例
---
src/views/eam/EquipmentList.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/src/views/eam/EquipmentList.vue b/src/views/eam/EquipmentList.vue
index a633527..5b43b6e 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">
@@ -403,6 +404,9 @@
<a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
<a @click="handleEdit(record)" >缂栬緫</a>
</a-menu-item>
+ <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
+ <a @click="handleEditSpareParts(record)" >缂栬緫澶囦欢</a>
+ </a-menu-item>
<a-menu-item>
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@@ -425,22 +429,34 @@
<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="澶囦欢" key="4" forceRender>
+ <EquipmentSpareParts :mainId="selectedMainId" />
+ </a-tab-pane>
+ <a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
+ <equipment-update-ABC-list :mainId="selectedMainId" />
+ </a-tab-pane>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" 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>
+ <EquipmentSparePartsModal ref="modalFormSpareParts" @ok="modalFormOk" />
</a-card>
</template>
@@ -457,9 +473,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'
+ import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
+ import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
export default {
name: "EquipmentList",
mixins:[JeecgListMixin,mixinDevice],
@@ -469,9 +489,15 @@
EquipmentPrecisionParametersList,
EquipmentModal,
EquipmentResumeDrawer,
- JSearchSelectTag,
+ JSearchSelectTag,
ProcessEditModel,
PrecisionEditModel,
+ EquipmentUpdateABCList ,
+ EquipmentUpdateWarrantyList,
+ ABCUpdateEditModel,
+ WarrantyUpdateModel,
+ EquipmentSpareParts,
+ EquipmentSparePartsModal
},
data () {
return {
@@ -726,6 +752,7 @@
xs: { span: 24 },
sm: { span: 16 },
},
+ mainId:'',
}
},
created() {
@@ -761,16 +788,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 +895,15 @@
}
})
},
+ handleUpdateABC(){
+ this.$refs.updateABC.add();
+ },
+ handleUpdateWarranty(){
+ this.$refs.updateWarranty.add();
+ },
+ handleEditSpareParts(record){
+ this.$refs.modalFormSpareParts.edit(record);
+ }
}
}
--
Gitblit v1.9.3