From 6531cad6be8634d9ee718fb4607eefee14473b18 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 31 八月 2024 23:23:09 +0800
Subject: [PATCH] 修改了权限
---
ruoyi-ui/vue.config.js | 2 +-
ruoyi-ui/src/views/system/user/index.vue | 33 ++++++++++++++++++++++++---------
2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 03803f1..06aded8 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -559,14 +559,15 @@
}
console.log(this.allInfo2,'鏂板a=1鏂板a=1鏂板a=1')
})
- }else{
- updatePO(tpfid,this.sex).then(response =>{
- for(let i in response.data[0]){
- this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
- }
- console.log(this.allInfo2,'淇敼a=2淇敼a=2淇敼a=2')
- })
}
+ // else{
+ // updatePO(tpfid,this.sex).then(response =>{
+ // for(let i in response.data[0]){
+ // this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
+ // }
+ // console.log(this.allInfo2,'淇敼a=2淇敼a=2淇敼a=2')
+ // })
+ // }
// console.log(sex,'sexsexsex')
},
// 鍏抽棴寮圭獥鍚�
@@ -849,19 +850,31 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
+ this.reset();
this.a = 2
this.pOID = row.userId
this.sex = row.sex
this.getSex();
- this.reset();
+
+ this.getAllIn()
const userId = row.userId || this.ids;
this.cuid= row.userId || this.ids;
+ let clanId = this.$store.state.user.clanId
+ this.allInfo2 = []
+ //alert(this.form.sex)
+ addPO(this.sex, clanId).then(response =>{
+ for(let i in response.data[0]){
+ this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
+ }
+ })
// this.fid = response.data.familyId
//alert(this.fid)
+ let _this = this
getUser(userId).then(response => {
+ console.log(response.data)
this.form = response.data;
console.log(response.data,'formformformformform')
- console.log(this.form.spouseId,'浼翠荆id')
+ // console.log(_this.form.spouseId,'浼翠荆id')
this.postOptions = response.posts;
this.roleOptions= []
this.roleOptions.push(response.roles[1])
@@ -889,6 +902,8 @@
_this.$set(_this.form,'fid',response.data.fatherId);
_this.$set(_this.form,'mid',response.data.momId);
_this.$set(_this.form,'isMyFamily',response.data.isMyFamily);
+ console.log(response.data.spouseId)
+ console.log("==============_________________000000000")
_this.$set(_this.form,'spouseId',response.data.spouseId);
if(response.data.roleId==3)
_this.$set(_this.form,'role',102);
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index c878696..ff976d1 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -37,7 +37,7 @@
// 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://192.168.1.3:8080/`,
+ // target: `https://192.168.1.3:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1