From 01adce6d9fc82f29cc2a29b35ee727b642284715 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期一, 31 七月 2023 17:52:11 +0800
Subject: [PATCH] 隐私、财产的修改
---
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 2 +-
ruoyi-ui/src/views/selfeconomy/index.vue | 29 ++++++++++++++++++++---------
ruoyi-ui/src/router/index.js | 2 +-
ruoyi-ui/src/views/secret/index.vue | 10 +++++-----
4 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index d2e7fb3..1a90121 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -450,7 +450,7 @@
component: Layout,
// permissions: [],
hidden: true,
- permissions: ['self:secret:info'],
+ permissions: ['person:secret:info'],
children: [
{
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 66c906e..6ed191d 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -110,10 +110,10 @@
<template slot-scope="scope">{{scope.row.validityDate? scope.row.validityDate: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="瀵嗙爜" prop="password" sortable width="100" />
- <el-table-column label="鏄惁寮�鍚寚绾�" prop="isFinger" sortable width="120" >
+ <el-table-column label="鏄惁寮�鍚寚绾�" prop="isFinger" sortable width="130" >
<template slot-scope="scope">{{scope.row.isFinger===1 ?'鏄�': '鍚�'}}</template>
</el-table-column>>
- <el-table-column label="鏄惁寮�鍚汉鑴�" prop="isFace" sortable width="120" >
+ <el-table-column label="鏄惁寮�鍚汉鑴�" prop="isFace" sortable width="130" >
<template slot-scope="scope">{{scope.row.isFace===1 ?'鏄�': '鍚�'}}</template>
</el-table-column>
<el-table-column label="绉佹湁/鍏湁" prop="isPrivate" sortable width="100" >
@@ -203,7 +203,7 @@
<el-date-picker
v-model='formDat.validityDate'
type='date'
- placeholder='閫夋嫨鏃ユ湡'
+ placeholder='閫夋嫨鏈夋晥鏈�'
></el-date-picker>
</el-form-item>
<el-form-item label="瀵嗙爜" prop="password">
@@ -318,7 +318,7 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
- import {listSecret,enload,getEconomyInfo,delSecret, addSecret, uploadPic} from "@/api/secret/index";
+ import {listSecret,enload,delSecret, addSecret, uploadPic} from "@/api/secret/index";
export default {
name: "Role",
@@ -430,7 +430,7 @@
}],
validityDate: [{
- // required: true,
+ required: true,
message: '璇烽�夋嫨鏈夋晥鏈�',
trigger: 'change'
}],
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 78060e2..15ce206 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -68,6 +68,16 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
+ <el-form-item label="璐骇鍚嶇О" prop="incomeName">
+ <el-input
+ v-model="queryParams.incomeName"
+ placeholder="璇疯緭鍏ヨ储浜у悕绉�"
+ clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
<el-cntainer>
<el-col :span="9" >
<el-form-item>
@@ -150,7 +160,7 @@
<el-table-column label="璐骇绫诲埆" prop="type" sortable width="120" align="center">
<template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鑾峰緱鏂瑰紡" prop="incomeName" sortable :show-overflow-tooltip="true" width="120" align="center" >
+ <el-table-column label="璐骇鍚嶇О" prop="incomeName" sortable :show-overflow-tooltip="true" width="120" align="center" >
<template slot-scope="scope">{{scope.row.incomeName? scope.row.incomeName: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="浠峰�硷紙閲戦锛�" prop="price" sortable width="140" align="center" >
@@ -252,8 +262,8 @@
<el-input v-model="formDat.type" placeholder="璇疯緭鍏ヨ储浜х被鍒�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鏀舵敮鍚嶇О" prop="incomeName">
- <el-input v-model="formDat.incomeName" placeholder="璇疯緭鍏ユ敹鏀悕绉�" clearable :style="{width: '100%'}" >
+ <el-form-item label="璐骇鍚嶇О" prop="incomeName">
+ <el-input v-model="formDat.incomeName" placeholder="璇疯緭鍏ヨ储浜у悕绉�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="閲戦" prop="price">
@@ -445,6 +455,7 @@
incomeName:undefined,
timeLimit:undefined,
happenTime:undefined,
+
},
// searchVal:"",
@@ -742,20 +753,20 @@
if(Ids.length==0)
{
- this.download('zIdea/export', {
+ this.download('zProperty/export', {
...this.queryParams
- }, `zIdea_${new Date().getTime()}.xlsx`)
+ }, `zProperty_${new Date().getTime()}.xlsx`)
}else{
- this.download('zIdea/export1/'+Ids, {
- }, `zIdea_${new Date().getTime()}.xlsx`)
+ this.download('zProperty/export1/'+Ids, {
+ }, `zProperty_${new Date().getTime()}.xlsx`)
}
},
/** 瀵煎叆妯℃澘涓嬭浇鎸夐挳鎿嶄綔 */
handleExportModel() {
- this.download('/zIdea/model', {
- }, `zIdea_model_${new Date().getTime()}.xlsx`)
+ this.download('/zProperty/model', {
+ }, `zProperty_model_${new Date().getTime()}.xlsx`)
},
/** 瀵煎叆鎿嶄綔*/
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index 849a329..97f6d0c 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -5,7 +5,7 @@
</div>
<div style="padding-left:15px">
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="120px">
+ <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="140px">
<el-container>
<el-row :span="12">
--
Gitblit v1.9.1