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/mdc/base/MdcplancloseList.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/mdc/base/MdcplancloseList.vue b/src/views/mdc/base/MdcplancloseList.vue
index 120f807..bfd66cc 100644
--- a/src/views/mdc/base/MdcplancloseList.vue
+++ b/src/views/mdc/base/MdcplancloseList.vue
@@ -33,11 +33,11 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<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="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>
<!-- 楂樼骇鏌ヨ鍖哄煙 -->
<!--<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
@@ -156,8 +156,8 @@
list: "/mdc/mdcPlanClose/list",
delete: "/mdc/mdcPlanClose/delete",
deleteBatch: "/mdc/mdcPlanClose/deleteBatch",
- exportXlsUrl: "/plan/mdcplanclose/exportXls",
- importExcelUrl: "plan/mdcplanclose/importExcel",
+ exportXlsUrl: "/mdc/mdcPlanClose/exportXls",
+ importExcelUrl: "mdc/mdcPlanClose/importExcel",
},
dictOptions:{},
@@ -175,8 +175,8 @@
methods: {
importTemplate(fileName){
var a = document.createElement("a");
- a.href = "/static/璁″垝鍋滄満.xls";
- a.download = "璁″垝鍋滄満.xls";
+ a.href = "/static/璁″垝鍋滄満绠＄悊.xls";
+ a.download = "璁″垝鍋滄満绠＄悊.xls";
a.style.display = "none";
document.body.appendChild(a);
a.click();
--
Gitblit v1.9.3