From f468170d79dee3f8efb75705c7e23a1b53e54e91 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 29 七月 2025 22:08:02 +0800
Subject: [PATCH] 修改了内容
---
ruoyi-ui/src/views/system/family/index.vue | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/ruoyi-ui/src/views/system/family/index.vue b/ruoyi-ui/src/views/system/family/index.vue
index a362c8a..97ae58c 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"
@@ -57,7 +57,7 @@
</el-row>
<el-table v-loading="loading" :data="roleList" :row-key="getRowId" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
+<!-- <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="100"/>
<el-table-column label="瀹跺涵鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="150" />
@@ -71,13 +71,13 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>淇敼</el-button>
- <el-button
+ <!-- <el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
+ >鍒犻櫎</el-button> -->
</template>
</el-table-column>
@@ -98,17 +98,6 @@
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ搴悕绉�" @blur="chongf()"/>
</el-form-item>
- <el-form-item label="鏈鎴愬憳" prop="fid">
- <el-select v-model="form.fid" :disabled="ts" placeholder="璇烽�夋嫨" @change="handleChange">
- <el-option
- v-for="item in fatherInfo"
- :key="item.id"
- :label="item.label"
- :value="item.id"
- ></el-option>
- </el-select>
-
- </el-form-item>
@@ -197,9 +186,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- roleName: undefined,
- roleKey: undefined,
- status: undefined
+ name: undefined,
+ clanId: undefined
},
personInfos:[],
personInfos1:[],
@@ -208,7 +196,8 @@
id: undefined,
name: undefined,
mid: undefined,
- fid: undefined
+ fid: undefined,
+ clanId: undefined
},
defaultProps: {
children: "children",
@@ -234,8 +223,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 +258,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 +278,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;
}
);
@@ -479,6 +476,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