From cf948b62048be5f217623cc31a0d6d2680c72476 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期日, 22 十月 2023 22:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/note/index.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 1c3447e..fcfb7f2 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -125,7 +125,7 @@
plain
icon="el-icon-download"
size="mini"
- @click="handleExport"
+ @click="handleExportTemplate"
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
@@ -341,6 +341,7 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
import {listProperty,enload, getPropertyInfo, delProperty, getCategory, addProperty, uploadPic} from "@/api/note/index";
+import {Message} from "element-ui";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
@@ -670,7 +671,12 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
+ //瀵煎叆妯℃澘
+ handleExportTemplate(){
+ this.download('/family/property/model', {
+ }, `property${new Date().getTime()}.xlsx`)
+ },
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const Ids = this.ids;
@@ -686,24 +692,23 @@
}, `property_${new Date().getTime()}.xlsx`)
}
},
+
/** 瀵煎叆鎿嶄綔*/
handleEnport(params){
var file = params.file;
var formData = new FormData();
formData.append('excelImport', file);
let _this = this
- alert(file)
+
enload(formData).then(response => {
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- }).catch(err)
- {
- Message({ message: "瀵煎叆澶辫触", type: 'error' })
- }
+ }).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })});
}
}
+
};
</script>
<style>
--
Gitblit v1.9.1