From 102c7d7dc9f5af873f19c86a0d17d5d6addcbc32 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 19 九月 2023 17:39:28 +0800
Subject: [PATCH] 项目优化
---
src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue
index dbe7ce7..cc28f45 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue
@@ -35,11 +35,11 @@
<div class="table-operator" style="display: inline;">
<a-button @click="handleAdd" type="primary" icon="plus">鏂板
</a-button>
- <a-button type="primary" icon="download" @click="importTemplate('鍔犵彮绠＄悊妯℃澘')">瀵煎叆妯℃澘</a-button>
+ <!--<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-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">
@@ -155,7 +155,7 @@
{
title: '鏃ユ湡',
align: 'center',
- dataIndex: 'torqueDate',
+ dataIndex: 'effectiveDate',
// scopedSlots:{customRender:'startTime'},
// customRender:(text,row,index) => {
// return moment(text).format("YYYY-MM-DD HH:mm:ss")
@@ -164,27 +164,27 @@
{
title: '鐝寮�濮嬫椂闂�',
align: 'center',
- dataIndex: 'torqueValue'
+ dataIndex: 'startDate'
},
{
title: '鐝缁撴潫鏃堕棿',
align: 'center',
- dataIndex: 'torqueValue'
+ dataIndex: 'endDate'
},
{
title: '鍔犵彮寮�濮嬫椂闂�',
align: 'center',
- dataIndex: 'torqueValue'
+ dataIndex: 'startTime'
},
{
title: '鍔犵彮缁撴潫鏃堕棿',
align: 'center',
- dataIndex: 'torqueValue'
+ dataIndex: 'endTime'
},
{
title: '澶囨敞',
align: 'center',
- dataIndex: 'notes'
+ dataIndex: 'remark'
},
{
title: '鎿嶄綔',
@@ -195,12 +195,12 @@
}
],
url: {
- list: '/mdc/MdcTorqueConfig/pageList',
- delete: '/mdc/MdcTorqueConfig/deleteMdcTorqueConfig',
- deleteBatch: '/mdc/MdcTorqueConfig/deleteBatchMdcTorqueConfig',
+ list: '/mdc/mdcEquipmentOvertime/list',
+ delete: '/mdc/mdcEquipmentOvertime/delete',
+ deleteBatch: '/mdc/mdcEquipmentOvertime/deleteBatch',
getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
- exportXlsUrl: "/mdc/MdcTorqueConfig/exportXls",
- importExcelUrl: "/mdc/MdcTorqueConfig/importExcel",
+ exportXlsUrl: "/mdc/mdcEquipmentOvertime/exportXls",
+ importExcelUrl: "/mdc/mdcEquipmentOvertime/importExcel",
}
}
},
@@ -569,7 +569,7 @@
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
@@ -611,7 +611,7 @@
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
--
Gitblit v1.9.3