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/modules/mdcProcessQuantity/mdcProcessQuantityList.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue
index 27b1b18..35fa3d3 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.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">
@@ -36,7 +36,7 @@
<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-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>
@@ -81,7 +81,7 @@
<mdc-process-quantity-modal ref="modalForm" @ok="modalFormOk"></mdc-process-quantity-modal>
<mdc-process-quantity-edit ref="modalFormedit" @ok="modalFormOk"></mdc-process-quantity-edit>
- </a-card>
+ </div>
</template>
<script>
@@ -246,8 +246,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();
@@ -345,7 +345,7 @@
handleEdit: function (record) {
this.$refs.modalFormedit.edit(record);
this.$refs.modalFormedit.title = "缂栬緫";
- this.$refs.modalFormedit.disableSubmit = false;
+ // this.$refs.modalFormedit.disableSubmit = false;
},
handleTableChange(pagination, filters, sorter) {
this.dataSource = []
@@ -534,7 +534,7 @@
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
--
Gitblit v1.9.3