From 84e72d392eaf14e5243a02e22916194bc17d23b4 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 21 十月 2024 10:32:05 +0800
Subject: [PATCH] 设备列表调整
---
src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue | 229 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 186 insertions(+), 43 deletions(-)
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
index bddc15c..3b17e56 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
@@ -1,32 +1,35 @@
<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">
- <a-row :gutter="24">
+ <a-row :gutter="24" style="width: 100%;">
<a-col :md="7" :sm="7">
<a-form-item label="鏃堕棿">
<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,16 +38,30 @@
<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-button type="primary" icon="printer" v-print="'#DeviceList'" v-has="'holidayManagement:print'">鎵撳嵃</a-button>
+
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel">
+ <a-icon type="delete"/>
+ 鍒犻櫎
+ </a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
+ <a-icon type="down"/>
+ </a-button>
+ </a-dropdown>
</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">
@@ -69,7 +86,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>
@@ -122,16 +139,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}
},
@@ -139,6 +159,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")
@@ -147,27 +168,43 @@
{
title: '绫诲瀷',
align: 'center',
- dataIndex: 'type'
+ 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'
}
],
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination:{
+ current: 1,
+ pageSize: 30,
+ pageSizeOptions: ['30', '50', '100'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
url: {
list: '/mdc/mdcVacationManagement/pageList',
+ 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",
}
}
},
@@ -211,7 +248,7 @@
},
methods: {
dateParamChange(v1, v2) {
- // console.log(v1,v2)
+ console.log(v1,v2)
this.queryParam.startTime = v2[0]
this.queryParam.endTime = v2[1]
// console.log(v2[0],v2[1])
@@ -289,7 +326,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -322,8 +363,6 @@
param.field = this.getQueryField();
param.parentId = this.queryParams.parentId;
param.equipmentId = this.queryParams.equipmentId;
- param.startTime = this.queryParam.startTime;
- param.endTime = this.queryParam.endTime;
getAction(this.url.list,param).then((res) => {
if(res.success){
this.dataSource = res.result.records||res.result;
@@ -334,7 +373,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -372,7 +415,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -401,8 +448,10 @@
param.field = this.getQueryField();
param.parentId = this.queryParams.parentId;
param.equipmentId = this.queryParams.equipmentId;
- param.startTime = this.queryParam.startTime;
- param.endTime = this.queryParam.endTime;
+ if(this.queryParam.startTime && this.queryParam.endTime){
+ param.startTime = this.queryParam.startTime;
+ param.endTime = this.queryParam.endTime;
+ }
// console.log(param);
getAction(this.url.list,param).then((res) => {
if(res.success){
@@ -414,7 +463,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -448,7 +501,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -461,21 +518,86 @@
this.selectedRowKeys = []
},
handleDelete: function (id) {
- if(!this.url.deleteBatch){
+ if(!this.url.delete){
this.$message.error("璇疯缃畊rl.delete灞炴��!")
return
}
var that = this;
- deleteAction(that.url.deleteBatch, {id: id}).then((res) => {
+ deleteAction(that.url.delete, {id: id}).then((res) => {
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.searchQuery();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
+ },
+ batchDel: function () {
+ if(!this.url.deleteBatch){
+ this.$message.error("璇疯缃畊rl.deleteBatch灞炴��!")
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
+ return;
+ } else {
+ var ids = "";
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ",";
+ }
+ var that = this;
+ this.$confirm({
+ title: "纭鍒犻櫎",
+ content: "鏄惁鍒犻櫎閫変腑鏁版嵁?",
+ onOk: function () {
+ that.loading = true;
+ deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
+ if (res.success) {
+ //閲嶆柊璁＄畻鍒嗛〉闂
+ that.reCalculatePage(that.selectedRowKeys.length)
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
+ that.loadData();
+ that.onClearSelected();
+ } else {
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() => {
+ that.loading = false;
+ });
+ }
+ });
+ }
+ },
+ 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)
@@ -507,7 +629,11 @@
_this.equipment = res.result
_this.searchQuery()
} else {
- _this.$message.warning('璇烽厤缃澶囷紒')
+ // _this.$message.warning('璇烽厤缃澶囷紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}
})
@@ -523,9 +649,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>
@@ -533,34 +675,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