From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/views/spare/modules/sparePart/SparePart2List.vue | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/views/spare/modules/sparePart/SparePart2List.vue b/src/views/spare/modules/sparePart/SparePart2List.vue
index 9fd59c3..2ac8d81 100644
--- a/src/views/spare/modules/sparePart/SparePart2List.vue
+++ b/src/views/spare/modules/sparePart/SparePart2List.vue
@@ -61,20 +61,30 @@
<a-button
@click="handleAdd"
type="primary"
+ v-has="'sparePartList:add'"
icon="plus"
:hidden="disabled"
>鏂板</a-button>
<a-button
type="primary"
icon="download"
- @click="handleExportXls('???')"
+ @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-button style="margin-left: 8px">
鎵归噺鎿嶄綔
<a-icon type="down" />
</a-button>
- <a-menu slot="overlay">
+ <a-menu slot="overlay" >
<a-menu-item @click="batchDel">
<a-icon type="delete" />鍒犻櫎
</a-menu-item>
@@ -103,6 +113,7 @@
>
<a
href="javascript:;"
+ v-has="'sparePartList:edit'"
@click="handleEdit(record)"
>缂栬緫</a>
<a-divider type="vertical" />
@@ -111,11 +122,11 @@
鏇村
<a-icon type="down" />
</a>
- <a-menu slot="overlay">
+ <a-menu slot="overlay" v-has="'sparePartList:delete'">
<!-- <a-menu-item>
<a @click="handleEdit(record)">缂栬緫</a>
</a-menu-item> -->
- <a-menu-item>
+ <a-menu-item >
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
@@ -303,7 +314,7 @@
delete: "/spare/sparePart/delete",
deleteBatch: "/spare/sparePart/deleteBatch",
exportXlsUrl: '/spare/sparePart/exportXls',
- // importExcelUrl: 'base/site/importExcel',
+ importExcelUrl: '/spare/sparePart/importExcel',
},
//鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴��
alterFlag: "",
@@ -331,6 +342,9 @@
selectedRowKeys: this.selectedRowKeys,
};
},
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ }
},
methods: {
--
Gitblit v1.9.3