From bd40473c9c634005bc7e62e7fc901bcd8b598fa0 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 02 二月 2024 15:20:26 +0800
Subject: [PATCH] 提交了修改
---
ruoyi-ui/src/views/note/index.vue | 119 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 83 insertions(+), 36 deletions(-)
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index f4fefc4..730314f 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -2,13 +2,16 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="绫诲瀷" prop="type">
- <el-input
- v-model="queryParams.type"
- placeholder="璇疯緭鍏ョ被鍨�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- />
+
+ <el-select v-model="queryParams.type" placeholder="璇烽�夋嫨绫诲埆" clearable
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;" allow-create
+ filterable clearable :style="{width: '100%'}" >
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="鏍囬" prop="title">
@@ -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: 240px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -107,11 +125,11 @@
plain
icon="el-icon-download"
size="mini"
- @click="handleExport"
+ @click="handleExportTemplate"
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.2">
+ <el-col :span="1.5">
<el-upload
action=""
class="upload-demo"
@@ -120,7 +138,7 @@
>
<el-button size="mini" type="primary"
plain
- icon="el-icon-plus" >瀵煎叆</el-button>
+ icon="el-icon-top" >瀵煎叆</el-button>
</el-upload>
</el-col>
@@ -170,8 +188,9 @@
></div>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
+ <div class="button-container">
<el-button
size="mini"
type="text"
@@ -190,6 +209,7 @@
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</el-dropdown>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -210,7 +230,8 @@
<!-- <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="绫诲埆" prop="type">
- <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
+ <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" allow-create
+ filterable clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -231,11 +252,9 @@
</el-input>
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
- <el-input
- v-model='formDat.happenTime'
- type='date'
- placeholder='閫夋嫨鏃ユ湡'
- ></el-input>
+ <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
@@ -322,7 +341,9 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
-import {listProperty,enload, getPropertyInfo, delProperty, getCategory, addProperty, uploadPic} from "@/api/note/index";
+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'],
@@ -358,7 +379,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -468,14 +492,21 @@
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
// console.log(this.queryParams)
+ let _this = this
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listProperty(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.propertyList = response.data.data;
+ if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+ {
+ _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ _this.loading = false;
+ }else{
+ _this.propertyList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
+ _this.total = response.data.total;
+ _this.loading = false;
+ }
}
);
},
@@ -483,11 +514,16 @@
getCateInfor()
{
let _this = this
+ _this.typeOptions = []
getCategory().then(response=>{
-
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ console.log(response.data)
+ // alert(9801)
+ response.data.map(elem=>{
+ _this.typeOptions.push({"label":elem, "value":elem})
})
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // })
})
},
@@ -644,6 +680,7 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
+ //alert(23)
const Ids = row.id || this.ids;
this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
return delProperty(Ids);
@@ -652,7 +689,12 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
+ //瀵煎叆妯℃澘
+ handleExportTemplate(){
+ this.download('/family/property/model', {
+ }, `property${new Date().getTime()}.xlsx`)
+ },
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const Ids = this.ids;
@@ -668,27 +710,26 @@
}, `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>
+<style scoped="">
.el-table__row.statistics-warning-row {
background: #E0EEFE;
@@ -697,4 +738,10 @@
background: #FFEFF2;
}
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
--
Gitblit v1.9.1