From 8524ef141cf0baef7b345a6c46446a50a07b42fb Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 三月 2024 16:48:21 +0800
Subject: [PATCH] xg
---
src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue | 92 ++++++++++++++++++++++++++++++++-------------
1 files changed, 65 insertions(+), 27 deletions(-)
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
index 2707162..184f6bd 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false" class="device_list">
+ <div :bordered="false" class="device_list">
<!-- 鏌ヨ鍖哄煙 -->
<div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -9,24 +9,27 @@
<a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD"/>
</a-form-item>
</a-col>
- <a-col :md="4" :sm="4">
+ <a-col :md="5" :sm="5">
<a-form-item label="璁惧缂栧彿">
<a-input placeholder="杈撳叆璁惧缂栧彿鏌ヨ" v-model="queryParams.equipmentId"></a-input>
</a-form-item>
</a-col>
- <a-col :md="4" :sm="4" :xs="4">
+ <a-col :md="5" :sm="5" :xs="5">
<a-form-item label="璁惧鍚嶇О">
<a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
- <a-col :md="2" :sm="3" :xs="3">
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- </a-col>
<a-col :md="2" :sm="2" :xs="2">
- <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ <a-space>
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ </a-space>
</a-col>
- <!--<a-col :lg="2" :md="3" :sm="3" :xs="3">-->
- <!--<a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>-->
+ <!--<a-col :md="2" :sm="2" :xs="2">-->
+ <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
+ <!--</a-col>-->
+ <!--<a-col :md="2" :sm="2" :xs="2">-->
+ <!--<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>-->
<!--</a-col>-->
</a-row>
</a-form>
@@ -35,10 +38,12 @@
<div class="table-operator" style="display: inline;">
<a-button @click="handleAdd" type="primary" icon="plus">鏂板
</a-button>
- <!--<a-button type="primary" icon="download" @click="handleExportXls('鍋囨湡绠＄悊')">瀵煎嚭</a-button>-->
- <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
- <!--<a-button type="primary" icon="import">瀵煎叆</a-button>-->
- <!--</a-upload>-->
+ <a-button type="primary" icon="download" @click="importTemplate('鍋囨湡绠＄悊妯℃澘')">瀵煎叆妯℃澘</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('鍋囨湡绠＄悊')">瀵煎嚭</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">瀵煎叆</a-button>
+ </a-upload>
+
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel">
@@ -53,9 +58,9 @@
</div>
<!-- table鍖哄煙-begin -->
- <div id="DeviceList">
+ <div id="DeviceList" style="flex: 1;overflow: hidden">
<a-table ref="table" bordered size="middle" rowKey="id" :columns="columns"
- :scroll="{x:1000}" :dataSource="dataSource" :pagination="ipagination" :loading="loading"
+ :scroll="{x:'max-content',y:scrollY}" :dataSource="dataSource" :pagination="ipagination" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
@@ -80,7 +85,7 @@
<holiday-management-modal ref="modalForm" @ok="modalFormOk"></holiday-management-modal>
<holiday-management-modal-edit ref="modalFormedit" @ok="modalFormOk"></holiday-management-modal-edit>
- </a-card>
+ </div>
</template>
<script>
@@ -133,16 +138,19 @@
queryParamEquip:{},
queryParamPeople:{},
dataStartsoucre:[],
+ scrollY:465,
columns: [
{
title: '璁惧缂栧彿',
align: 'center',
- dataIndex: 'equipmentId'
+ dataIndex: 'equipmentId',
+ width:250
},
{
title: '璁惧鍚嶇О',
align: 'center',
dataIndex: 'equipmentName',
+ width:250
// defaultSortOrder:'descend',
// sorter: (a, b) => {return a.equipmentName>b.equipmentName?1:-1}
},
@@ -150,6 +158,7 @@
title: '鏃ユ湡',
align: 'center',
dataIndex: 'vacationDate',
+ width:250
// scopedSlots:{customRender:'startTime'},
// customRender:(text,row,index) => {
// return moment(text).format("YYYY-MM-DD HH:mm:ss")
@@ -158,19 +167,22 @@
{
title: '绫诲瀷',
align: 'center',
- dataIndex: 'vacationType'
+ dataIndex: 'vacationType',
+ width:250
},
{
title: '澶囨敞',
align: 'center',
- dataIndex: 'notes'
+ dataIndex: 'notes',
+ width:250
},
{
title: '鎿嶄綔',
dataIndex: 'action',
scopedSlots: {customRender: 'action'},
align: "center",
- width: 150
+ width: 150,
+ fixed:'right'
}
],
url: {
@@ -178,8 +190,8 @@
delete: '/mdc/mdcVacationManagement/deleteVacation',
deleteBatch: '/mdc/mdcVacationManagement/deleteBatchVacation',
getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
- exportXlsUrl: "/mdc/MdcTorqueConfig/exportXls",
- importExcelUrl: "/mdc/MdcTorqueConfig/importExcel",
+ exportXlsUrl: "/mdc/mdcVacationManagement/exportXls",
+ importExcelUrl: "/mdc/mdcVacationManagement/importExcel",
}
}
},
@@ -565,6 +577,15 @@
});
}
},
+ importTemplate(fileName){
+ var a = document.createElement("a");
+ a.href = "/static/鍋囨湡绠＄悊.xls";
+ a.download = "鍋囨湡绠＄悊.xls";
+ a.style.display = "none";
+ document.body.appendChild(a);
+ a.click();
+ a.remove();
+ },
handleAdd() {
this.$refs.modalForm.add(this.node)
this.$refs.modalForm.title = '鏂板'
@@ -615,9 +636,25 @@
exclude_inputs: true
});
},
+
+ /**
+ * 褰撴祻瑙堝櫒鍙绐楀彛灏哄鍙戠敓鏀瑰彉鏃惰Е鍙�
+ */
+ handleWindowResize(){
+ const boxHeight = +window.getComputedStyle(document.getElementById('DeviceList')).height.slice(0,-2)
+ const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0,-2)
+ this.scrollY = boxHeight - tableHeadHeight - 50
+ }
},
created() {
this.queryParam.typeTree = "1"
+ },
+ mounted(){
+ window.addEventListener('resize',this.handleWindowResize)
+ this.handleWindowResize()
+ },
+ beforeDestroy(){
+ window.removeEventListener('resize',this.handleWindowResize)
}
}
</script>
@@ -625,34 +662,35 @@
<style lang="less" scoped>
@import '~@assets/less/common.less';
+ .device_list{
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ }
+
@media screen and (min-width: 1920px){
.device_list{
height: 811px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1680px) and (max-width: 1920px){
.device_list{
height: 811px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1400px) and (max-width: 1680px){
.device_list{
height: 663px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1280px) and (max-width: 1400px){
.device_list{
height: 564px!important;
- overflow: scroll;
}
}
@media screen and (max-width: 1280px){
.device_list{
height: 564px!important;
- overflow: scroll;
}
}
</style>
--
Gitblit v1.9.3