From d14437e20cbd781725583e15c444da6f58192de8 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 29 十二月 2025 15:03:27 +0800
Subject: [PATCH] 增加了代码
---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 7544778..09a767a 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -266,6 +266,13 @@
<input type="checkbox" v-model="selectedMemberIds" :value="item.userId">
<span>{{ item.oldName }}</span>
</label>
+ <hr class="divider-line">
+
+ <label v-for="item in anotherFamilyMembers" :key="item.userId" class="signature-checkbox">
+ <input type="checkbox" v-model="selectedMemberIds" :value="item.userId">
+ <span> {{ item.oldName }} </span>
+ </label>
+
<!-- 澶氶�夊垪琛紙鏈夋暟鎹級 -->
<!-- <el-checkbox-group>
<el-checkbox
@@ -295,7 +302,7 @@
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";
import { getFamilyeventInfo, updateFamilyevent, uploadPic, download} from "@/api/bignote/index";
-import { getFamilyMembers } from '@/api/root'; // 鍋囪鑾峰彇瀹舵棌鎴愬憳鐨凙PI
+import { getFamilyMembers ,listAnotherFamilyInfo} from '@/api/root'; // 鍋囪鑾峰彇瀹舵棌鎴愬憳鐨凙PI
export default {
components: {},
@@ -306,6 +313,7 @@
// 鎴愬憳澶氶�夌浉鍏�
memberDialogVisible: false, // 寮圭獥鍙鎬�
familyMembers: [], // 瀹舵棌鎴愬憳鍒楄〃锛堝師濮嬫暟鎹級
+ anotherFamilyMembers: [], //鍙﹀瀹舵棌鎴愬憳淇℃伅
selectedMemberIds: [], // 寮圭獥涓复鏃堕�変腑鐨勬垚鍛業D锛堢敤浜庡閫変氦浜掞級
displayMemberNames: [], // 鏄剧ず鐢ㄧ殑鎴愬憳鍚嶇О鏁扮粍
memberSearch: '', // 鎴愬憳鎼滅储鍏抽敭璇�
@@ -384,15 +392,20 @@
const filteredNames = this.familyMembers
.filter(member => this.selectedMemberIds.includes(member.userId))
.map(member => member.oldName);
+ const filterAnotherNames = this.anotherFamilyMembers
+ .filter(member => this.selectedMemberIds.includes(member.userId))
+ .map(member => member.oldName);
// 鍒涘缓涓�涓猄et鏉ュ瓨鍌ㄥ敮涓�鍚嶇О锛岄伩鍏嶉噸澶�
const uniqueNames = new Set([...filteredNames]);
+filterAnotherNames.forEach(item => uniqueNames.add(item));
// 濡傛灉displayMemberNames鏈夊唴瀹癸紝涔熷姞鍏et涓�
if(this.displayMemberNames && this.displayMemberNames.length > 0) {
this.displayMemberNames.forEach(name => uniqueNames.add(name));
}
-
+ else
+ this.displayMemberNames = Array.from(uniqueNames)
// 杞洖鏁扮粍骞惰繑鍥�
return Array.from(uniqueNames);
},
@@ -497,7 +510,7 @@
item => item !== name // 杩囨护鎺変笌鍏抽棴鍚嶇О鐩稿悓鐨勫厓绱�
)
console.log(this.selectedMemberNames)
-
+
},
// 纭閫夋嫨鎴愬憳锛堜繚瀛樺埌琛ㄥ崟锛�
confirmMemberSelection() {
@@ -507,6 +520,10 @@
// 灏嗗脊绐楅�変腑鐨処D鍚屾鍒拌〃鍗�
this.memberDialogVisible = false;
this.$message.info(`宸查�夋嫨 ${this.selectedMemberNames.length} 鍚嶅鏃忔垚鍛榒);
+ // 娓呯┖瀵硅瘽妗嗛噷闈㈤�夋嫨鐨勫唴瀹�
+ // if(this.displayMemberNames.length==0)
+ this.displayMemberNames = this.selectedMemberNames
+ this.selectedMemberIds = [];
},
splitPeopleToSelectedNames(people) {
// 澶勭悊閫昏緫锛�
@@ -538,12 +555,14 @@
this.loading = true;
let clanId = this.$store.state.user.clanId
+ let userId = this.$store.state.user.userId
try {
const res = await getFamilyMembers(clanId); // 鍋囪闇�瑕佸鏃廔D鍙傛暟
-
+ const ano = await listAnotherFamilyInfo(userId)
console.log(res)
console.log(res.data)
+ this.anotherFamilyMembers = ano.data;
this.familyMembers = res.data;
console.log(this.familyMembers)
console.log(this.familyMembers.length)
--
Gitblit v1.9.1