From d0136913a2c74a44f5bb30327ebbb3fd85e24fce Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 23 一月 2024 10:56:30 +0800
Subject: [PATCH] 修改了很多
---
ruoyi-ui/src/views/economy/economyInfo.vue | 14
ruoyi-ui/src/views/travel/index.vue | 19
ruoyi-ui/src/views/secret/secretInfo.vue | 47 ++
ruoyi-ui/vue.config.js | 4
ruoyi-ui/src/views/system/user/index.vue | 248 ++++++++++--
ruoyi-ui/src/views/contacts/contactsInfo.vue | 38 +
ruoyi-ui/src/views/economy/index.vue | 28
ruoyi-ui/src/api/system/user.js | 49 ++
ruoyi-ui/src/views/mindMap/index.vue | 7
ruoyi-ui/src/views/self/show.vue | 4
ruoyi-ui/src/views/system/user/profile/index.vue | 586 +++++++++++++++---------------
ruoyi-ui/src/api/note/index.js | 4
ruoyi-ui/src/views/honor/honorInfo.vue | 4
ruoyi-ui/src/views/note/index.vue | 32 +
14 files changed, 679 insertions(+), 405 deletions(-)
diff --git a/ruoyi-ui/src/api/note/index.js b/ruoyi-ui/src/api/note/index.js
index 884c5a5..e5c17c1 100644
--- a/ruoyi-ui/src/api/note/index.js
+++ b/ruoyi-ui/src/api/note/index.js
@@ -55,9 +55,9 @@
export function getCategory()
{
return request({
- url: '/zDict/byId',
+ url: '/family/property/type',
method: 'get',
- params: {'id':22}
+ // params: {'id':22}
})
}
//澧炲姞璧勪骇淇℃伅
diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js
index 1738144..027b6f1 100644
--- a/ruoyi-ui/src/api/system/user.js
+++ b/ruoyi-ui/src/api/system/user.js
@@ -162,6 +162,51 @@
return request({
url: '/family/all' ,
method: 'get',
-
+
})
-}
\ No newline at end of file
+}
+
+export function getInfoByFid(fid)
+{
+ return request({
+ url:'/self/user/list/getInfoByfid/'+fid,
+ method: 'get'
+ })
+}
+export function getIndividual(id){
+ return request({
+ url:'/self/user/'+id,
+ method: 'get'
+ })
+}
+export function getAllInfo(){
+ return request({
+ url:'/self/user/allFamInfo',
+ method: 'get'
+ })
+}
+export function setAuority(data)
+{
+ return request({
+ url:'/authority/empower',
+ method:'post',
+ data:data
+ })
+}
+export function getUserByFidAid(data)
+{
+ return request({
+ url:'/authority/getInfoByAidFid',
+ method: 'post',
+ data: data
+ })
+}
+export function deleteUserByFidAid(data)
+{
+ return request({
+ url:'/authority/deleteInfoByAidFid',
+ method: 'post',
+ data: data
+ })
+}
+// export function get
diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index ad7498b..ec4a40b 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -66,8 +66,12 @@
</el-cow>
<el-cow>
<el-form-item label="鏄惁甯歌仈绯�" prop="isAlways" label-width="90px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.isAlways === 1 ? '鏄�':'鍚�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-if="dte" v-model="formData.isAlways === 1 ? '鏄�':'鍚�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
+ <el-select v-if="!dte" v-model="formData.isAlways" placeholder="璇烽�夋嫨鏄惁甯歌仈绯�" 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-cow>
<el-cow>
@@ -216,7 +220,7 @@
// 鏁版嵁鑼冨洿閫夐」
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:[
@@ -284,7 +288,15 @@
}],
},
- typeOptions: [],
+ typeOptions: [{
+ value: '鏄�',
+ label: '鏄�',
+ },
+ {
+ value: '鍚�',
+ label: '鍚�',
+ }],
+ dte:false,
}
},
computed: {},
@@ -297,6 +309,7 @@
jd = this.$route.query.detail
this.btn= jd
this.dsb = !jd
+ this.dte = false
this.isShow=true
// document.title = "淇敼閫氳褰曡缁嗕俊鎭�";
this.$route.meta.title = "淇敼閫氳褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
@@ -305,6 +318,7 @@
// document.title = "閫氳褰曡缁嗕俊鎭�";
this.$route.meta.title = "閫氳褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
this.isShow=false
+ this.dte=true
this.btn = false;
}
@@ -313,6 +327,10 @@
this.loading = true;
getContactIdList(id).then((response) => {
this.formData = response.data;
+ if(this.formData.isAlways==0)
+ this.formData.isAlways='鍚�'
+ else
+ this.formData.isAlways = '鏄�'
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
{
@@ -347,17 +365,29 @@
}).join(",")
this.formData.url = ul+","+uls
- this.$refs['elForm'].validate(valid => {
+ this.$refs['elForm'].validate(valid => {
+ if(this.formData.isAlways=='鍚�')
+ this.formData.isAlways = 0
+ else
+ this.formData.isAlways = 1
if (valid) {
if (this.formData.id != undefined) {
updateContact(this.formData).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
// this.open = false;
+ if(this.formData.isAlways==0)
+ this.formData.isAlways='鍚�'
+ else
+ this.formData.isAlways = '鏄�'
this.btn=false
});
} else {
+ if(this.formData.isAlways==0)
+ this.formData.isAlways='鍚�'
+ else
+ this.formData.isAlways = '鏄�'
this.$modal.msgSuccess("淇敼澶辫触");
}
diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index 86d959b..0026e3d 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -43,12 +43,12 @@
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
- <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">
- <el-input v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>
- </el-form-item>
+ <!-- <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">
+ <el-input v-model="formData.ownData === 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled="true"></el-input>
+ </el-form-item> -->
- <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
+ <h4 class="form-header">鐩稿叧鍥剧墖</h4>
<el-upload
action="#"
list-type="picture-card"
@@ -186,7 +186,7 @@
// 鏁版嵁鑼冨洿閫夐」
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:[
@@ -280,6 +280,8 @@
this.loading = true;
getEconomyInfo(id).then((response) => {
this.formData = response.data;
+ // console.log(this.formData)
+ //alert(this.formData.ownData)
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
{
@@ -438,7 +440,7 @@
updateEconomy(_this.formData).then(response => {
this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
})
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 0251554..411ce05 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -108,7 +108,7 @@
</el-row>
<!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵ｅ垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
- <el-table v-loading="loading" :data="economyList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" :data="economyList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
@@ -127,11 +127,11 @@
<template slot-scope="scope">{{scope.row.kind? scope.row.kind: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
- <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+ <template slot-scope="scope">{{scope.row.ownData === 1 ? '鏄�': '鍚�'}}</template>
</el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable width="110" >
<template slot-scope="scope" >
- <div @click="handleCheck(scope.row)">
+ <div >
<img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -165,18 +165,19 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['familymodel:economy:info']"
>淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- :disabled="!scope.row.ownData"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ >鍒犻櫎</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
<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>
@@ -352,7 +353,7 @@
// 鏁版嵁鑼冨洿閫夐」
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:[
@@ -504,7 +505,7 @@
listEconomy(this.queryParams).then(response => {
// alert(123)
- // console.log(response.data)
+ // console.log(response.data.data)
this.economyList = response.data.data;
this.total = response.data.total;
@@ -598,6 +599,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
+ // alert(123)
const id = row.id;
this.$router.push("/familymodel/economy/economyInfo/" + id);
},
diff --git a/ruoyi-ui/src/views/honor/honorInfo.vue b/ruoyi-ui/src/views/honor/honorInfo.vue
index 373e1d3..b3dfe10 100644
--- a/ruoyi-ui/src/views/honor/honorInfo.vue
+++ b/ruoyi-ui/src/views/honor/honorInfo.vue
@@ -225,7 +225,7 @@
// 鏁版嵁鑼冨洿閫夐」
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:[],
dsb:true,
@@ -331,6 +331,7 @@
this.isShow=true
this.showInput=true
this.isEditing=true
+
// document.title = "淇敼鑽ｈ獕璇佷功璇︾粏淇℃伅";
this.$route.meta.title = "淇敼鑽ｈ獕璇佷功璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
@@ -346,6 +347,7 @@
this.loading = true;
getHonor({id}).then((response) => {
this.formData = response.data;
+ // alert(this.formData.type)
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
{
diff --git a/ruoyi-ui/src/views/mindMap/index.vue b/ruoyi-ui/src/views/mindMap/index.vue
index e05683d..2cba0b6 100644
--- a/ruoyi-ui/src/views/mindMap/index.vue
+++ b/ruoyi-ui/src/views/mindMap/index.vue
@@ -78,11 +78,11 @@
getUserProfile().then(response => {
this.user = response.data;
});
- listRoot(4).then(response =>{
+ listRoot(5).then(response =>{
this.rootList =response.data;
const mindMapData = this.rootList[0];
- // console.log(mindMapData)
+ console.log(mindMapData)
// console.log(this.drawData(mindMapData))
this.mapData = this.drawData(mindMapData)
this.showMindMap = true
@@ -96,6 +96,7 @@
"label": mpdata['spouse'] != null ? eval(mpdata['spouse']).nickName : '',
"prop": mpdata['nickName'],
"url": 'https://www.bendudu.com:8080/'+mpdata['url'],
+ // "purl": 'https://www.bendudu.com:8080/'+mpdata['spouse'],
"id": mpdata['userId'],
"link": mpdata['nickName'],
"children": []
@@ -104,7 +105,7 @@
if (mpdata['childList'] != null) {
for (var i = 0; i < mpdata['childList'].length; i++) {
var dt = {
- "label": mpdata['childList'][i]['spouse'] != null ? eval(mpdata['childList'][i]['spouse']).nickName : '',
+ "label": mpdata['childList'][i]['spouse'] != null ? eval(mpdata['childList'][i]['spouse']).nickName : "",
"prop": mpdata['childList'][i]['nickName'],
"url": 'https://www.bendudu.com:8080/'+mpdata['childList'][i]['url'],
"id": mpdata['childList'][i]['userId'],
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 2a38206..0cf20a7 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -2,16 +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
+
+ <el-select v-model="queryParams.type" placeholder="璇烽�夋嫨绫诲埆" clearable
style="width: 200px;
height: 35px;
border-radius: 16px 16px 16px 16px;
- opacity: 0.5;"
- @keyup.enter.native="handleQuery"
- />
+ 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">
@@ -230,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>
@@ -340,7 +341,8 @@
//鍦╯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",
@@ -380,7 +382,7 @@
// 鏁版嵁鑼冨洿閫夐」
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:[
@@ -512,11 +514,15 @@
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)
+ response.data.map(elem=>{
+ _this.typeOptions.push({"label":elem.type, "value":elem.type})
})
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // })
})
},
diff --git a/ruoyi-ui/src/views/secret/secretInfo.vue b/ruoyi-ui/src/views/secret/secretInfo.vue
index e8642c9..44af156 100644
--- a/ruoyi-ui/src/views/secret/secretInfo.vue
+++ b/ruoyi-ui/src/views/secret/secretInfo.vue
@@ -274,21 +274,21 @@
},
typeOptions2: [
{
- value: '0',
+ value: '鍚�',
label: '鍚�',
},
{
- value: '1',
+ value: '鏄�',
label: '鏄�',
}
],
typeOptions3: [
{
- value: '0',
+ value: '绉佹湁',
label: '绉佹湁',
},
{
- value: '1',
+ value: '鍏湁',
label: '鍏湁',
}
],
@@ -337,7 +337,7 @@
else
this.formData.isFace = '鍚�'
if(this.formData.isPrivate==1)
- this.formData.isPrivate = '鍏辨湁'
+ this.formData.isPrivate = '鍏湁'
else
this.formData.isPrivate = '绉佹湁'
let paths = response.data.url.split(",");
@@ -390,7 +390,18 @@
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
this.formData.url = ul+","+uls
-
+if(this.formData.isFinger=='鏄�')
+ this.formData.isFinger = 1
+ else
+ this.formData.isFinger = 0
+ if(this.formData.isFace=='鏄�')
+ this.formData.isFace = 1
+ else
+ this.formData.isFace = 0
+ if(this.formData.isPrivate== '鍏湁')
+ this.formData.isPrivate =1
+ else
+ this.formData.isPrivate = 0
this.$refs['elForm'].validate(valid => {
@@ -398,10 +409,34 @@
if (this.formData.id != undefined) {
updateSecret(this.formData).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
+ if(this.formData.isFinger==1)
+ this.formData.isFinger = '鏄�'
+ else
+ this.formData.isFinger = '鍚�'
+ if(this.formData.isFace==1)
+ this.formData.isFace = '鏄�'
+ else
+ this.formData.isFace = '鍚�'
+ if(this.formData.isPrivate==1)
+ this.formData.isPrivate = '鍏湁'
+ else
+ this.formData.isPrivate = '绉佹湁'
// this.open = false;
this.btn=false
});
} else {
+ if(this.formData.isFinger==1)
+ this.formData.isFinger = '鏄�'
+ else
+ this.formData.isFinger = '鍚�'
+ if(this.formData.isFace==1)
+ this.formData.isFace = '鏄�'
+ else
+ this.formData.isFace = '鍚�'
+ if(this.formData.isPrivate==1)
+ this.formData.isPrivate = '鍏湁'
+ else
+ this.formData.isPrivate = '绉佹湁'
this.$modal.msgSuccess("淇敼澶辫触");
}
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index fa51a96..0a16e7e 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -682,10 +682,10 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="骞撮緞娈碉細" prop="ageBegin ageEnd" label-width="70px">
- <el-input v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
+ <el-input type="number" v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
</el-input>
<span> 宀� 鈥斺��</span>
- <el-input v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
+ <el-input type="number" v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
</el-input>
<span> 宀� </span>
</el-form-item>
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index b2b305a..ce425f0 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -190,7 +190,7 @@
<el-col :span="12">
<el-form-item label="瑙掕壊" prop="roleIds">
<el-select v-model="rt" placeholder="璇烽�夋嫨瑙掕壊" @change="getRole">
- <el-option :key="-1" :label="鏃�" :value="-1">鏃�</el-option>
+
<el-option
v-for="item in roleOptions"
:key="item.roleId"
@@ -203,44 +203,7 @@
</el-col>
</el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="瀹跺涵鍙�">
- <el-select v-model="fid" placeholder="璇烽�夋嫨瀹跺涵鍙�">
- <el-option :key="-1" :label="鏃�"
- value="鏃�">鏃�</el-option>
-
- <el-option
- v-for="item in famiInfo"
- :key="item.id"
- :label="item.name"
- :value="item.id"
-
- ></el-option>
- </el-select>
-
- </el-form-item>
- </el-col>
-
- <el-col :span="12">
- <el-form-item label="閭" prop="email">
- <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" maxlength="50" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛鍚嶇О" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛瀵嗙爜" prop="password">
- <el-input v-model="form.password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�" type="password" maxlength="20" show-password/>
- </el-form-item>
- </el-col>
- </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="鐢ㄦ埛鎬у埆">
@@ -268,10 +231,78 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
- <el-input v-model="form.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="11" />
+ <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛鍚嶇О" prop="userName">
+ <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛瀵嗙爜" prop="password">
+ <el-input v-model="form.password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�" type="password" maxlength="20" show-password/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+
+ <el-col :span="12">
+ <el-form-item label="瀹跺涵鍙�">
+ <el-select v-model="fid" placeholder="璇烽�夋嫨瀹跺涵鍙�" @change="handleChange">
+
+ <el-option
+ key="-1"
+ label="鏃�"
+ value="-1"
+ ></el-option>
+ <el-option
+ v-for="item in famiInfo"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+
+ ></el-option>
+ </el-select>
+
+ </el-form-item>
+ </el-col>
+
+ </el-row>
+
+ <el-row v-if="isshowMar">
+
+ <el-col :span="12">
+ <el-form-item label="鏄惁鏈" prop="isMyFamily">
+ <el-select v-model="form.isMyFamily" placeholder="璇疯緭鍏ユ槸鍚︽湰瀹�" @change="handleFamily">
+
+
+ <el-option
+ key=1
+ label="鏄�"
+ value=1
+ ></el-option>
+ <el-option
+ key=0
+ label="鍚�"
+ value=0
+ ></el-option>
+ </el-select>
+
+ </el-form-item>
+ </el-col>
+
+ </el-row>
+ <el-row v-if="isshowMri">
+ <el-col :span="12">
+ <el-form-item label="閰嶅伓淇℃伅" prop="spouseId">
+ <el-select v-model="form.spouseId" placeholder="璇烽�夋嫨閰嶅伓淇℃伅">
+ <el-option
+ v-for="item in allInfo"
+ :key="item.userId"
+ :label="item.nickName"
+ :value="item.userId"
+ ></el-option>
+ </el-select>
+
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="24">
@@ -320,7 +351,10 @@
</template>
<script>
-import { listUser, getUser, delUser, updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { getIndividual,getInfoByFid,
+getAllInfo,listUser, getUser, delUser,
+ updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd,
+ changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -345,6 +379,8 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
+ isshowMri: false,
+ isshowMar: false,
// 鐢ㄦ埛琛ㄦ牸鏁版嵁
userList: null,
// 寮瑰嚭灞傛爣棰�
@@ -367,7 +403,11 @@
// 瑙掕壊閫夐」
roleOptions: [],
// 琛ㄥ崟鍙傛暟
-
+ motherInfo:[],
+ fathorInfo:[],
+ allInfo:[],
+ faid: 0,
+ maid: 0,
form: {},
defaultProps: {
children: "children",
@@ -419,10 +459,15 @@
roleIds: [
{ required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
],
+ isMyFamily: [
+ { required: true, message: "鏄惁澶栧珌涓嶈兘涓虹┖", trigger: "blur" }
+ ],
deptId: [
{ required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
],
-
+ spouseId: [
+ { required: true, message: "閰嶅伓淇℃伅涓嶈兘涓虹┖", trigger: "blur" }
+ ],
password: [
{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
{ min: 5, max: 20, message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿', trigger: 'blur' }
@@ -454,11 +499,48 @@
this.getList();
this.getFamlilyInfo();
this.getDeptTree();
+ //鎷垮埌鑷繁瀹氫箟鐨勭敤鎴蜂俊鎭�
+ // this.getAllIn();
this.getConfigKey("sys.user.initPassword").then(response => {
this.initPassword = response.msg;
});
},
methods: {
+ handleChange()
+ {
+ // alert(this.fid)
+ if(this.fid=="鏃�")
+ this.fid = "-1"
+ if(this.fid!="-1")
+ {
+ //鏌ヨ涓嶆槸鏈鐨勬椂鍊欙紝鍙互閫夋嫨鐨勯厤鍋朵俊鎭�
+ alert(this.fid)
+
+ getInfoByFid(this.fid).then(response=>{
+ console.log("--------------------")
+ console.log(response.data)
+ this.allInfo = response.data
+ })
+ this.isshowMar = true
+ }
+ else{
+ this.isshowMar = false
+ }
+ },
+ handleFamily()
+ {
+ alert(this.form.isMyFamily)
+ if(this.form.isMyFamily=="0")
+ this.isshowMri = true
+ },
+ getAllIn(){
+ // alert(123)
+ getAllInfo().then(response => {
+ // this.allInfo = response.data;
+ // console.log(response.data)
+ // alert(982)
+ })
+ },
getRole(){
this.form.roleIds = []
//alert(123)
@@ -467,8 +549,13 @@
getFamlilyInfo(){
let _this = this
getAllFamilys().then(response => {
- //console.log(response.data)
- _this.famiInfo = response.data
+ // console.log(response.data)
+ // alert(response.data[0])
+ _this.famiInfo= response.data.filter(function(item){
+ return item.name !== "涓�鍙峰搴�";
+});
+
+
})
},
/** 鏌ヨ鐢ㄦ埛鍒楄〃 */
@@ -511,6 +598,9 @@
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
+ this.fid = "鏃�"
+ this.isshowMar = false
+ this.isshowMri = false
this.reset();
},
// 琛ㄥ崟閲嶇疆
@@ -568,7 +658,10 @@
this.reset();
getUser().then(response => {
this.postOptions = response.posts;
- this.roleOptions = response.roles;
+ // this.roleOptions = response.roles;
+ this.roleOptions= []
+ this.roleOptions.push(response.roles[1])
+ this.roleOptions.push(response.roles[3])
this.open = true;
this.title = "娣诲姞鐢ㄦ埛";
this.form.password = this.initPassword;
@@ -578,11 +671,29 @@
handleUpdate(row) {
this.reset();
const userId = row.userId || this.ids;
+ // alert(userId)
+
+ // this.fid = response.data.familyId
+ //alert(this.fid)
getUser(userId).then(response => {
this.form = response.data;
+ console.log(response.data)
this.postOptions = response.posts;
this.roleOptions = response.roles;
+ // alert(response.roleIds.length)
+ if(response.roleIds.length!=0)
this.rt = response.roleIds[0]
+ let _this = this
+
+ getIndividual(userId).then(response => {
+ // alert(123)
+ console.log(response.data)
+ if(response.data!=undefined)
+ {
+ _this.fid = response.data.familyId;
+ }
+ }
+ );
this.$set(this.form, "postIds", response.postIds);
this.$set(this.form, "roleIds", response.roleIds);
this.open = true;
@@ -618,45 +729,70 @@
// alert(this.form.roleIds)
let ps = true
- // alert(this.rt)
- // alert(this.fid)
+ // alert(this.rt)
+ // alert(this.fid)
+ if(this.fid=="鏃�")
+ this.fid = -1
let _this = this
- if(this.rt===2 && (this.fid!="鏃�"))
+ if(this.rt===2 && (this.fid!=-1))
{
ps = false
}
+ if(this.rt!=2&&this.fid==-1)
+ {
+ this.$modal.msgSuccess("瀹跺涵鎴愬憳锛屽繀椤昏鎷ユ湁瀹跺涵鍙凤紒");
+ return
+ }
// alert(ps)
if(ps)
{
+ let fm = {}
+ fm.userId = _this.form.userId
+
+ if(_this.fid==="鏃�")
+ fm.familyId= -1
+ else
+ fm.familyId = _this.fid
+ this.form.familyId = fm.familyId
+
if (valid) {
if (this.form.userId != undefined) {
updateUser(this.form).then(response => {
- let fm = {}
- fm.userId = _this.form.userId
-
- if(_this.fid==="鏃�")
- fm.familyId= -1
- else
- fm.familyId = _this.fid
+
updateUserInfo(fm).then(response=>{
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
+ _this.rt = undefined
+ _this.fid = "鏃�"
+ this.isshowMar = false
+ this.isshowMri = false
})
});
} else {
+ // alert(this.form.ismarry)
+ // alert(987)
addUser(this.form).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
+ _this.rt = undefined
+ _this.fid = "鏃�"
+ this.isshowMar = false
+ this.isshowMri = false
});
}
}
+
+
}
else{
this.$modal.msgSuccess("鏅�氳鑹蹭笉鑳芥嫢鏈夊搴彿锛�");
+ // _this.rt = undefined
+ _this.fid = "鏃�"
+ _this.isshowMar = false
}
});
},
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index ca1c733..1d0d92b 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -56,252 +56,77 @@
</el-col>
</el-row>
<div style="padding-top: 20px; background-color: #F4FFF8;">
- <div class="container">
- <div>
- <span style="font-family: Microsoft YaHei-Regular, Microsoft YaHei; padding-left: 10px;">鏉冮檺鎯呭喌</span>
- </div>
- <div style="padding-left: 10px;">
- <el-dropdown v-model="selectedFamily" @command="handleDropdownCommand">
- <span class="el-dropdown-link">
- {{ selectedFamily || '涓嬫媺鑿滃崟' }}<i class="el-icon-arrow-down el-icon--right"></i>
- </span>
- <el-dropdown-menu slot="dropdown">
- <el-dropdown-item command="涓�鍙峰搴�">涓�鍙峰搴�</el-dropdown-item>
- <el-dropdown-item command="浜屽彿瀹跺涵">浜屽彿瀹跺涵</el-dropdown-item>
- <el-dropdown-item command="涓夊彿瀹跺涵">涓夊彿瀹跺涵</el-dropdown-item>
- <el-dropdown-item command="鍥涘彿瀹跺涵">鍥涘彿瀹跺涵</el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
- </div>
- </div>
+
<el-divider></el-divider>
<div >
- <el-tabs v-model="activeTab1" style="padding-left: 25px;" @tab-click="handleTabClick">
- <el-tab-pane label="瀹舵牴缃�" prop="瀹舵牴缃�">
- <span >鏌ョ湅鏉冮檺</span>
- <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鏂板鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鍒犻櫎鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.delete === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>淇敼鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.update === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- </el-tab-pane>
- <el-tab-pane label="瀹跺ぇ浜嬭">
- <span >鏌ョ湅鏉冮檺</span>
- <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鏂板鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鍒犻櫎鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.delete === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>淇敼鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.update === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+ <el-row>
+ <el-col :span="10" :xs="24">
+ <el-form-item label="鑿滃崟鏉冮檺">
+ <el-tree
+ class="tree-border"
+ :data="menuOptions"
+ show-checkbox
+ ref="authr"
+ node-key="id"
+:default-expand-all="true"
- </el-tab-pane>
- <el-tab-pane label="瀹跺涵璧勪骇">
- <span >鏌ョ湅鏉冮檺</span>
- <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鏂板鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鍒犻櫎鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.delete === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>淇敼鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.update === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- </el-tab-pane>
- <el-tab-pane label="瀹跺涵璁惧">
- <span >鏌ョ湅鏉冮檺</span>
- <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鏂板鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鍒犻櫎鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.delete === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>淇敼鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.update === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- </el-tab-pane>
- <el-tab-pane label="鏀惰棌鑽ｈ獕">
- <span >鏌ョ湅鏉冮檺</span>
- <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鏂板鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鍒犻櫎鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.delete === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>淇敼鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.update === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- </el-tab-pane>
- <el-tab-pane label="灏忓尰鐢�">
- <span >鏌ョ湅鏉冮檺</span>
- <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鏂板鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鍒犻櫎鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.delete === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>淇敼鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.update === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- </el-tab-pane>
- <el-tab-pane label="淇濇磥鏀剁撼">
- <span >鏌ョ湅鏉冮檺</span>
- <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鏂板鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鍒犻櫎鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.delete === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>淇敼鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.update === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- </el-tab-pane>
- <el-tab-pane label="閫氳褰�">
- <span >鏌ョ湅鏉冮檺</span>
- <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鏂板鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鍒犻櫎鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.delete === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>淇敼鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.update === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- </el-tab-pane>
- <el-tab-pane label="榄呭疇">
- <span >鏌ョ湅鏉冮檺</span>
- <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鏂板鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鍒犻櫎鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.delete === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>淇敼鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.update === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- </el-tab-pane>
- <el-tab-pane label="瀹跺涵鏀舵敮鍙拌处">
- <span >鏌ョ湅鏉冮檺</span>
- <span style="padding-left: 1200px;">{{SelfPermissionList.search === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鏂板鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.insert === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>鍒犻櫎鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.delete === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- <span>淇敼鏉冮檺</span>
- <span style="padding-left: 1200px;">{{ SelfPermissionList.update === 0 ? '鏈寔鏈�' : '鎸佹湁' }}</span>
- <el-divider></el-divider>
- </el-tab-pane>
- </el-tabs>
+ empty-text="鍔犺浇涓紝璇风◢鍊�"
+ :props="defaultProps"
+ ></el-tree> </el-form-item>
+ </el-col>
+ <el-col :span="4" :xs="24" type="flex" align="middle">鍙互鎺堟潈鐩稿叧浜哄憳</el-col>
+ <el-col :span="10" :xs="24">
+ <el-tree
+ class="tree-border"
+ :data="menuOptions1"
+ show-checkbox
+ ref="peoInfo"
+ node-key="id"
+
+ empty-text="鍔犺浇涓紝璇风◢鍊�"
+ :props="defaultProps"
+ ></el-tree>
+ </el-col>
+</el-row>
+<el-button type="primary" @click="upAuthority">鎺堟潈</el-button>
+ </el-form>
</div>
- </div>
-
-<div style="padding-top: 25px;">
- <div v-if="user.roleName==='瀹跺涵绠＄悊鍛�'" style=" padding-top: 25px;background-color: #F4FFF8;" >
- <div class="container">
+ <el-divider></el-divider>
<div>
- <span style="font-family: Microsoft YaHei-Regular, Microsoft YaHei; padding-left: 10px;">鍏朵粬瀹跺涵鏉冮檺绠＄悊</span>
- </div>
- <div style="padding-left: 10px;">
- <el-dropdown v-model="selectedFamily" @command="handleDropdownCommand1">
- <span class="el-dropdown-link">
- {{ command1 ||'涓嬫媺鑿滃崟' }}<i class="el-icon-arrow-down el-icon--right"></i>
- </span>
- <el-dropdown-menu slot="dropdown">
- <el-dropdown-item command="涓�鍙峰搴�">涓�鍙峰搴�</el-dropdown-item>
- <el-dropdown-item command="浜屽彿瀹跺涵">浜屽彿瀹跺涵</el-dropdown-item>
- <el-dropdown-item command="涓夊彿瀹跺涵">涓夊彿瀹跺涵</el-dropdown-item>
- <el-dropdown-item command="鍥涘彿瀹跺涵">鍥涘彿瀹跺涵</el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
+ <el-form>
+ <el-row>
+ <el-col :span="10" :xs="24">
+ <el-form-item label="鏀跺洖鏉冮檺">
+ <el-select v-model="st" placeholder="璇烽�夋嫨鑿滃崟" @change="handleChange">
+ <el-option v-for="mo in menuOptions2" :label="mo.label" :value="mo.id" :key="mo.id"></el-option>
+ </el-select>
+
+
+ </el-form-item>
+ </el-col>
+ <el-col :span="4" :xs="24" class="centered">宸茬粡鎺堟潈鐩稿叧浜哄憳</el-col>
+ <el-col :span="10" :xs="24">
+ <el-form-item label="宸茬粡鎺堟潈鐩稿叧鎴愬憳">
+ <el-tree
+ class="tree-border"
+ :data="menuOptionsp"
+ show-checkbox
+ ref="spp"
+ node-key="id"
+ :default-expand-all="true"
+
+ empty-text="鍔犺浇涓紝璇风◢鍊�"
+ :props="defaultProps"
+ ></el-tree> </el-form-item>
+ </el-col>
+ </el-row>
+ <el-button type="primary" @click="deleteAuthority">鏀跺洖鎺堟潈</el-button>
+ </el-form>
</div>
</div>
- <el-divider></el-divider>
- <div v-if="FaimlyList && FaimlyList.length > 0">
- <el-tabs v-model="activeTab2" style="padding-left: 25px;" @tab-click="handleTabClick1">
- <el-tab-pane label="瀹舵牴缃�" prop="瀹舵牴缃�">
- <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
- </el-tab-pane>
- <el-tab-pane label="瀹跺ぇ浜嬭">
- <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
- </el-tab-pane>
- <el-tab-pane label="瀹跺涵璧勪骇">
- <span>
- <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
-
- </span>
- </el-tab-pane>
- <el-tab-pane label="瀹跺涵璁惧">
- <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
-
- </el-tab-pane>
- <el-tab-pane label="鏀惰棌鑽ｈ獕">
- <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
-
- </el-tab-pane>
- <el-tab-pane label="灏忓尰鐢�">
- <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
-
- </el-tab-pane>
- <el-tab-pane label="淇濇磥鏀剁撼">
- <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
-
- </el-tab-pane>
- <el-tab-pane label="閫氳褰�">
- <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
-
- </el-tab-pane>
- <el-tab-pane label="榄呭疇">
- <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
-
- </el-tab-pane>
- <el-tab-pane label="瀹跺涵鏀舵敮鍙拌处">
- <span v-for="member in FaimlyList" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
-
- </el-tab-pane>
- </el-tabs>
- </div>
- </div>
-</div>
-
-<div style="padding-top: 20px">
- <div v-if="user.roleName==='瀹跺涵绠＄悊鍛�'" style=" padding-top: 25px;background-color: #F4FFF8;" >
- <div>
- <span style="font-family: Microsoft YaHei-Regular, Microsoft YaHei; padding-left: 10px;">瀹跺涵鎴愬憳绠＄悊</span><el-divider></el-divider>
- </div>
- <div style="padding-left: 20px;padding-top: 10px">
- <span v-for="member in FaimlyList1" :key="member.id">{{ member.name }}<el-divider></el-divider></span>
- </div>
- </div>
-</div>
</div>
</template>
@@ -310,7 +135,8 @@
import userAvatar from "./userAvatar";
import userInfo from "./userInfo";
import resetPwd from "./resetPwd";
-import { getUserProfile ,getSelfPermission,getFamilyids} from "@/api/system/user";
+import { getAllInfo,getUserProfile ,getSelfPermission,getFamilyids,setAuority
+,getUserByFidAid,deleteUserByFidAid} from "@/api/system/user";
import { getIndividualList } from "@/api/self";
import {updateFamilyevent} from "@/api/bignote";
@@ -323,6 +149,100 @@
familyName: undefined,
modelName: undefined,
},
+ fid: undefined,
+ st: undefined,
+ menuOptionsp:[
+ {
+ id: 1,
+ label: '瀹跺涵鎴愬憳',
+ children:[]
+ }
+ ],
+ menuOptions2:[
+ {
+ id: 2000,
+ label: '瀹跺涵璧勪骇绠＄悊',
+
+ },
+ {
+ id: 2012,
+ label: '瀹跺ぇ浜嬭',
+ },
+ { id:2016,
+ label: '瀹跺涵璁惧',
+ },
+ {
+ id: 2004,
+ label: '鏀惰棌鍜岃崳瑾�',
+
+ },
+ {
+ id: 2029,
+ label: '瀹跺涵灏忓尰鐢�',
+ },
+ { id:2024,
+ label: '淇濇磥鏀剁撼',
+ },
+ {
+ id: 2021,
+ label: '閫氳褰�',
+ },
+ { id:2033,
+ label: '榄呭疇',
+ },
+ {id:2008,
+ label: '瀹跺涵鏀舵敮鍙拌处',
+ }
+ ],
+ menuOptions1:[
+ {
+ id: 1,
+ label: '瀹跺涵鎴愬憳',
+ children:[]
+ }
+ ],
+ menuOptions:[
+ {
+ id: 1,
+ label: '瀹跺涵妯″潡',
+ children: [
+ {
+ id: 2000,
+ label: '瀹跺涵璧勪骇绠＄悊',
+
+ },
+ {
+ id: 2012,
+ label: '瀹跺ぇ浜嬭',
+ },
+ { id:2016,
+ label: '瀹跺涵璁惧',
+ },
+ {
+ id: 2004,
+ label: '鏀惰棌鍜岃崳瑾�',
+
+ },
+ {
+ id: 2029,
+ label: '瀹跺涵灏忓尰鐢�',
+ },
+ { id:2024,
+ label: '淇濇磥鏀剁撼',
+ },
+ {
+ id: 2021,
+ label: '閫氳褰�',
+ },
+ { id:2033,
+ label: '榄呭疇',
+ },
+ {id:2008,
+ label: '瀹跺涵鏀舵敮鍙拌处',
+ }
+ ],
+ },
+ ],
FaimlyList:undefined,
FaimlyList1:undefined,
selectedFamily: "涓�鍙峰搴�",
@@ -350,6 +270,85 @@
this.getList();
},
methods: {
+ deleteAuthority(){
+ // alert(this.st)
+ let uidKeys = this.$refs.spp.getCheckedKeys();
+ let auIds = []
+ auIds.push(this.st)
+ let data = {
+ uids: uidKeys,
+ fid: this.fid,
+ authoritys: auIds
+ }
+ let _this = this
+ if(this.st!=undefined&&uidKeys.length!=0){
+ deleteUserByFidAid(data).then(response=>{
+ this.$modal.msgSuccess(response.msg)
+ let data = {
+ "fid": _this.fid,
+ "authority": _this.st
+ }
+ // alert(data.authority)
+ // let _this = this
+ getUserByFidAid(data).then(response=>{
+ console.log(response)
+ let fams = response.data;
+ for(let i = 0 ; i < fams.length; i++)
+ _this.menuOptionsp[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })
+
+ })
+ })
+ }
+ else{
+ this.$modal.msgSuccess("鏉冮檺鎴栬鎺堟潈浜轰笉鑳戒负绌猴紒")
+ }
+ },
+ getDeptAllCheckedKeys() {
+ // 鐩墠琚�変腑鐨勯儴闂ㄨ妭鐐�
+ let checkedKeys = this.$refs.authr.getCheckedKeys();
+ // console.log(checkedKeys)
+ },
+ upAuthority(){
+ let checkedKeys = this.$refs.authr.getCheckedKeys();
+ let peoKeys = this.$refs.peoInfo.getCheckedKeys();
+ // console.log(peoKeys)
+ // alert(checkedKeys.length)
+ // this.getDeptAllCheckedKeys()
+ if(checkedKeys.length!=0&&peoKeys.length!=0)
+ {
+ let data = {
+ uids: peoKeys,
+ fid: this.fid,
+ authoritys: checkedKeys
+ }
+ // console.log(data)
+ // alert(123)
+ setAuority(data).then(response=>{
+ // console.log(response)
+ this.$modal.msgSuccess(response.msg)
+ // alert(response.data)
+ })
+ }
+ else{
+ this.$modal.msgSuccess("鏉冮檺鎴栬鎺堟潈浜轰笉鑳戒负绌猴紒");
+ }
+ },
+ handleChange(value){
+
+ let data = {
+ "fid": this.fid,
+ "authority": value
+ }
+ alert(data.authority)
+ let _this = this
+ getUserByFidAid(data).then(response=>{
+ console.log(response)
+ let fams = response.data;
+ for(let i = 0 ; i < fams.length; i++)
+ _this.menuOptionsp[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })
+
+ })
+ },
handleTabClick(tab) {
this.selectedTab = tab.label;
if (this.selectedFamily && this.selectedTab) {
@@ -360,29 +359,29 @@
this.selectedTab1 = tab.label;
},
handleDropdownCommand(command) {
- this.selectedFamily = command; // 鏇存柊閫変腑鐨勫搴�
- console.log(this.selectedFamily)
- // 妫�鏌ヤ笅鎷夎彍鍗曞拰鍒囩墖椤甸潰鏄惁閮借閫変腑
- if (this.selectedFamily && this.selectedTab) {
- this.getList();
- }
+ // this.selectedFamily = command; // 鏇存柊閫変腑鐨勫搴�
+ // console.log(this.selectedFamily)
+ // // 妫�鏌ヤ笅鎷夎彍鍗曞拰鍒囩墖椤甸潰鏄惁閮借閫変腑
+ // if (this.selectedFamily && this.selectedTab) {
+ // this.getList();
+ // }
},
handleDropdownCommand1(command1) {
- this.command1= command1;
- console.log(command1)
- let id = null;
- if (command1 == '涓�鍙峰搴�') {
- id = 1;
- } else if (command1 == '浜屽彿瀹跺涵') {
- id = 2;
- } else if (command1 == '涓夊彿瀹跺涵') {
- id = 3;
- } else if (command1 == '鍥涘彿瀹跺涵') {
- id = 4;
- }
- if (id) {
- this.getUser(parseInt(id)); // 灏唅d杞崲涓烘暟瀛楃被鍨�
- }
+ // this.command1= command1;
+ // console.log(command1)
+ // let id = null;
+ // if (command1 == '涓�鍙峰搴�') {
+ // id = 1;
+ // } else if (command1 == '浜屽彿瀹跺涵') {
+ // id = 2;
+ // } else if (command1 == '涓夊彿瀹跺涵') {
+ // id = 3;
+ // } else if (command1 == '鍥涘彿瀹跺涵') {
+ // id = 4;
+ // }
+ // if (id) {
+ // this.getUser(parseInt(id)); // 灏唅d杞崲涓烘暟瀛楃被鍨�
+ // }
},
@@ -394,45 +393,54 @@
// this.postGroup = response.postGroup;
// });
- getFamilyids(id).then(response => {
- console.log(id)
- this.FaimlyList = response.data;
- console.log("鎵撳嵃瀹跺涵鎴愬憳搴忓垪"+id)
- console.log(this.FaimlyList)
- });
+ // getFamilyids(id).then(response => {
+ // console.log(id)
+ // // this.FaimlyList = response.data;
+ // console.log("鎵撳嵃瀹跺涵鎴愬憳搴忓垪"+id)
+ // console.log(this.FaimlyList)
+ // });
getIndividualList().then(response => {
this.user = response.data;
-
+ // alert(890)
+ this.fid = response.data.familyId
+ // alert(this.fid)
this.roleGroup = response.roleGroup;
this.postGroup = response.postGroup;
});
- if (this.user.familyName='涓�鍙峰搴�'){
- id=1;
- getFamilyids(id).then(response => {
- console.log(id)
- this.FaimlyList1 = response.data;
- console.log("鎵撳嵃瀹跺涵鎴愬憳搴忓垪"+id)
- console.log(this.FaimlyList)
- });
- }
+ // if (this.user.familyName='涓�鍙峰搴�'){
+ // id=1;
+ // getFamilyids(id).then(response => {
+ // console.log(id)
+ // this.FaimlyList1 = response.data;
+ // console.log("鎵撳嵃瀹跺涵鎴愬憳搴忓垪"+id)
+ // console.log(this.FaimlyList)
+ // });
+ // }
},
getList() {
- var formData ={
- "familyName": this.selectedFamily,
- "modelName":this.selectedTab,
-}
+ let _this = this
- var jsonString = JSON.stringify(formData);
- // console.log(jsonString);
+ getAllInfo().then(response=>{
+ let fams = response.data
+ for(let i = 0; i < fams.length; i++)
+ _this.menuOptions1[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })
+ })
+// var formData ={
+// "familyName": this.selectedFamily,
+// "modelName":this.selectedTab,
+// }
- getSelfPermission(jsonString).then(response => {
- this.SelfPermissionList = response.data;
- console.log(this.SelfPermissionList)
- });
+// var jsonString = JSON.stringify(formData);
+// // console.log(jsonString);
+
+// getSelfPermission(jsonString).then(response => {
+// this.SelfPermissionList = response.data;
+// console.log(this.SelfPermissionList)
+// });
}
}
@@ -443,7 +451,13 @@
.container {
display: flex;
}
-
+.centered {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ text-align: center;
+}
.el-icon-arrow-down {
font-size: 12px;
}
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 15fe14c..9817e6e 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -277,13 +277,13 @@
</el-input>
</el-form-item>
<el-form-item label="璧峰鏃堕棿" prop="startTime">
- <el-date-picker v-model="formDat.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
- :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ <el-date-picker v-model="formDat4.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd" :style="{width: '100%'}"
></el-date-picker>
</el-form-item>
- <el-form-item label="缁撴潫鏃堕棿" prop="endTime">
- <el-date-picker v-model="formDat.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
- :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ <el-form-item label="缁撴潫鏃堕棿1" prop="endTime">
+ <el-date-picker v-model="formDat4.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :style="{width: '100%'}" value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<el-form-item label="鍘诲悜" prop="destination">
@@ -511,7 +511,7 @@
// 鏁版嵁鑼冨洿閫夐」
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:[
@@ -661,7 +661,7 @@
destination: [{
required: true,
message: '璇烽�夋嫨鍘诲悜',
- trigger: 'change'
+ trigger: 'blur'
}],
property: [{
required: true,
@@ -670,13 +670,14 @@
}],
startTime: [{
required: true,
+ type: "string",
message: '璇烽�夋嫨鏃ユ湡',
- trigger: 'change'
+ trigger: 'blur'
}],
endTime: [{
required: true,
message: '璇烽�夋嫨鏃ユ湡',
- trigger: 'change'
+ trigger: 'blur'
}],
name: [{
required: true,
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 05c769f..b1439c0 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -35,8 +35,8 @@
proxy: {
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `https://10.39.18.174:8080/`,
- target: 'https://www.bendudu.com:8080/',
+ target: `https://10.39.18.174:8080/`,
+ // target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.1