From 5d8ec11904ed78161f28e073317bbae653e6aad8 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期日, 08 十月 2023 21:03:58 +0800
Subject: [PATCH] 修改成了post请求，主要是后端代码的问题
---
ruoyi-ui/src/views/note/index.vue | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 1e5879e..fcfb7f2 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -6,7 +6,10 @@
v-model="queryParams.type"
placeholder="璇疯緭鍏ョ被鍨�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -16,7 +19,10 @@
v-model="queryParams.title"
placeholder="璇疯緭鍏ユ爣棰�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -25,7 +31,10 @@
v-model="queryParams.location"
placeholder="璇疯緭鍏ュ瓨鍌ㄥ湴鍧�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -34,7 +43,10 @@
v-model="queryParams.holder"
placeholder="璇疯緭鍏ユ寔鏈変汉"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -43,7 +55,10 @@
v-model="queryParams.address"
placeholder="璇疯緭鍏ュ叿浣撲綅缃�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -51,7 +66,10 @@
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -107,7 +125,7 @@
plain
icon="el-icon-download"
size="mini"
- @click="handleExport"
+ @click="handleExportTemplate"
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
@@ -140,6 +158,9 @@
<el-table-column label="鍏蜂綋浣嶇疆" prop="address" sortable width="150" />
<el-table-column label="澶囨敞" prop="remark" sortable width="130" >
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+ <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
</el-table-column>
<!-- <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" /> -->
<el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="150" align="center">
@@ -320,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'],
@@ -649,7 +671,12 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
+ //瀵煎叆妯℃澘
+ handleExportTemplate(){
+ this.download('/family/property/model', {
+ }, `property${new Date().getTime()}.xlsx`)
+ },
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const Ids = this.ids;
@@ -665,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