From ed96edec7c6dfd4944d0ee1c6d924c7cb808428c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 18 十月 2024 10:43:47 +0800
Subject: [PATCH] 修改了相应的bug
---
ruoyi-ui/src/views/system/family/index.vue | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/views/system/family/index.vue b/ruoyi-ui/src/views/system/family/index.vue
index 4ccfd06..300cdf8 100644
--- a/ruoyi-ui/src/views/system/family/index.vue
+++ b/ruoyi-ui/src/views/system/family/index.vue
@@ -2,9 +2,9 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="瀹跺涵鍚嶇О" prop="roleKey">
+ <el-form-item label="瀹跺涵鍚嶇О" prop="name">
<el-input
- v-model="queryParams.roleKey"
+ v-model="queryParams.name"
placeholder="璇疯緭鍏ユ潈闄愬瓧绗�"
clearable
style="width: 240px"
@@ -197,9 +197,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- roleName: undefined,
- roleKey: undefined,
- status: undefined
+ name: undefined,
+ clanId: undefined
},
personInfos:[],
personInfos1:[],
@@ -208,7 +207,8 @@
id: undefined,
name: undefined,
mid: undefined,
- fid: undefined
+ fid: undefined,
+ clanId: undefined
},
defaultProps: {
children: "children",
@@ -234,8 +234,9 @@
methods: {
chongf(){
//alert(2)
+ let clanId = this.$store.state.user.clanId
if(this.form.name!=""){
- findByFname(this.form.name).then(response => {
+ findByFname(this.form.name, clanId).then(response => {
console.log(response.data)
// alert(response.data!=null)
if(response.data!=null)
@@ -268,7 +269,9 @@
},
getAllUser(){
- getAllInfo().then(response=>{
+ let clanId = this.$store.state.user.clanId
+
+ getAllInfo(clanId).then(response=>{
let fams = response.data
let _this = this;
console.log(fams)
@@ -286,9 +289,14 @@
/** 鏌ヨ瑙掕壊鍒楄〃 */
getList() {
this.loading = true;
- listFamily().then(response => {
- this.roleList = response.data;
- // this.total = response.total;
+ let clanId = this.$store.state.user.clanId
+ // alert(clanId)
+ //alert(clanId)
+ this.queryParams.clanId = clanId;
+ listFamily(this.queryParams).then(response => {
+ console.log(response)
+ this.roleList = response.data.data;
+ this.total = response.data.total;
this.loading = false;
}
);
@@ -432,16 +440,17 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
- this.ts = false;
+ this.ts = false;
// this.getMenuTreeselect();
this.open = true;
this.title = "娣诲姞瀹跺涵鍙�";
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
+
this.reset();
// alert(row.fid)
- this.ts = true
+ // this.ts = true
this.$set(this.form, "fid", row.fid);
this.$set(this.form, "id", row.id);
this.$set(this.form, "name", row.name);
@@ -478,6 +487,8 @@
/** 鎻愪氦鎸夐挳 */
submitForm: function() {
let _this = this
+ let clanId = this.$store.state.user.clanId
+ this.form.clanId = clanId
this.$refs["form"].validate(valid => {
if (valid) {
// alert(this.form.id)
--
Gitblit v1.9.1