From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue
index 27b1b18..c5f34cc 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue
@@ -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>
@@ -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