From 8696b4d4c235a73f2bc5c030e20f1ad7c0a7166e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 25 二月 2025 14:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/standardMaterial/index.vue | 31 ++++---------------------------
1 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterial/index.vue b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
index 085b14e..e75f44f 100644
--- a/src/views/CNAS/resourceDemand/standardMaterial/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
@@ -5,11 +5,11 @@
<el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
<el-form-item label="鏍囧噯鐗╄川鍚嶇О" prop="name">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.name"
- @keyup.enter.native="refreshTable"></el-input>
+ @keyup.enter.native="searchList"></el-input>
</el-form-item>
<el-form-item label="鐢熶骇鍘傚" prop="factoryManufacturer">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.factoryManufacturer"
- @keyup.enter.native="refreshTable"></el-input>
+ @keyup.enter.native="searchList"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="searchList">鏌� 璇�</el-button>
@@ -191,31 +191,8 @@
exportOfStandardSubstanceList(this.searchForm).then(res =>{
this.outLoading = false
const blob = new Blob([res], {type: 'application/octet-stream'},false);
- let reader = new FileReader();
- reader.readAsText(blob, 'utf-8');
- reader.onload = () => {
- try {
- let result = JSON.parse(reader.result);
- if (result.message) {
- this.$message.error(result.message);
- } else {
- const url = URL.createObjectURL(blob);
- const link = document.createElement('a');
- link.href = url;
- link.download = '鏍囧噯鐗╄川娓呭崟.xlsx';
- link.click();
- this.$message.success('瀵煎嚭鎴愬姛')
- }
- } catch (err) {
- console.log(err);
- const url = URL.createObjectURL(blob);
- const link = document.createElement('a');
- link.href = url;
- link.download = '鏍囧噯鐗╄川娓呭崟.xlsx';
- link.click();
- this.$message.success('瀵煎嚭鎴愬姛')
- }
- }
+ this.$download.saveAs(blob, '鏍囧噯鐗╄川娓呭崟.xlsx')
+ this.$message.success('瀵煎嚭鎴愬姛')
})
},
// 鏌ヨ鍒楄〃
--
Gitblit v1.9.3