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/peopleSearch/index.vue | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/views/peopleSearch/index.vue b/ruoyi-ui/src/views/peopleSearch/index.vue
index 9eddba8..7638734 100644
--- a/ruoyi-ui/src/views/peopleSearch/index.vue
+++ b/ruoyi-ui/src/views/peopleSearch/index.vue
@@ -22,6 +22,8 @@
<input type="checkbox" v-model="searchForm.modules" :value="item.label">
<span>{{ item.value }}</span>
</label>
+
+
<!-- <el-select
v-model="searchForm.module"
placeholder="璇烽�夋嫨鎼滅储妯″潡"
@@ -187,6 +189,12 @@
<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-form-item>
<!-- 鎴栬�呬娇鐢ㄥ閫夋ā寮� -->
@@ -213,13 +221,14 @@
<script>
// 瀵煎叆API璇锋眰鍑芥暟锛堟牴鎹疄闄呴」鐩矾寰勮皟鏁达級
import { searchPeople, getModules } from '@/api/peopleSearch';
-import { getFamilyMembers } from '@/api/root'; // 鍋囪鑾峰彇瀹舵棌鎴愬憳鐨凙PI
+import { getFamilyMembers,listAnotherFamilyInfo } from '@/api/root'; // 鍋囪鑾峰彇瀹舵棌鎴愬憳鐨凙PI
export default {
name: 'PeopleSearch',
data() {
return {
names: "",
+ displayMemberNames:[],
selectedModules: [],
selectedMemberIds:[],
// ... existing data ...
@@ -241,12 +250,13 @@
{ id: 4, name: '瀹舵棌鎴愬憳4' },
{ id: 5, name: '瀹舵棌鎴愬憳5' }
],
+ anotherFamilyMembers: [], //鍙﹀瀹舵棌鎴愬憳淇℃伅
// 鎼滅储琛ㄥ崟鏁版嵁
searchForm: {
modules: [],
dateRange: [],
peoples: '',
- hasAttachment: ''
+ hasAttachment: '鏄�'
},
// 琛ㄥ崟楠岃瘉瑙勫垯
searchRules: {
@@ -281,11 +291,37 @@
computed: {
// 宸查�夋垚鍛樺鍚嶏紙鐢ㄤ簬鍥炴樉锛�
selectedMemberNames() {
- var od = this.familyMembers
- .filter(member => this.selectedMemberIds.includes(member.userId))
- .map(member => member.oldName);
- return od
+ // 浼樺厛浣跨敤鐩存帴璁剧疆鐨勬樉绀哄悕绉�
+ if(this.displayMemberNames && this.displayMemberNames.length > 0 && this.selectedMemberIds.length==0) {
+ return this.displayMemberNames;
+ }
+
+
+ // 鍚﹀垯鏍规嵁閫変腑鐨処D璁＄畻
+ // 鍚堝苟杩囨护鍚庣殑鎴愬憳鍚嶇О鍜宒isplayMemberNames鍐呭
+ console.log(this.selectedMemberIds)
+ 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));
+ console.log(uniqueNames)
+ // 濡傛灉displayMemberNames鏈夊唴瀹癸紝涔熷姞鍏et涓�
+ if(this.displayMemberNames && this.displayMemberNames.length > 0) {
+ this.displayMemberNames.forEach(name => uniqueNames.add(name));
+ }
+ else
+ this.displayMemberNames = Array.from(uniqueNames)
+ // this.selectedMemberIds = []
+ // 杞洖鏁扮粍骞惰繑鍥�
+ return Array.from(uniqueNames);
},
},
methods: {
@@ -294,10 +330,11 @@
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)
+ this.anotherFamilyMembers = ano.data
console.log(res)
console.log(res.data)
this.familyMembers = res.data;
@@ -320,7 +357,11 @@
// const response = await getModules(); response.data ||
this.modules = [
{ label: '浜嬬邯', value: '浜嬬邯' },
- { label: '閮ㄩ棬绠＄悊', value: 'department' },
+ { label: '瀹朵骇', value: '瀹朵骇' },
+ { label: '鏀惰棌', value: '鏀惰棌' },
+ { label: '閫氳褰�', value: '閫氳褰�' },
+ { label: '鏀舵敮', value: '鏀舵敮' },
+ { label: '鏃呮父', value: '鏃呮父' },
// { label: '瑙掕壊绠＄悊', value: 'role' },
// { label: '椤圭洰绠＄悊', value: 'project' }
];
@@ -476,6 +517,11 @@
// this.loginForm.familyMemberName = selectedName;
this.familyMemberDialogVisible = false;
+ this.$message.info(`宸查�夋嫨 ${this.selectedMemberNames.length} 鍚嶅鏃忔垚鍛榒);
+ // 娓呯┖瀵硅瘽妗嗛噷闈㈤�夋嫨鐨勫唴瀹�
+ // if(this.displayMemberNames.length==0)
+ this.displayMemberNames = this.selectedMemberNames
+ this.selectedMemberIds = [];
}
--
Gitblit v1.9.1