From f6ba10af9f368f251de29e77ba88d5ad33bc31d6 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 13 一月 2026 14:54:37 +0800
Subject: [PATCH] 修改了代码
---
ruoyi-ui/src/views/collection/index.vue | 361 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 351 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 9a9dc82..f7db6d3 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -221,7 +221,11 @@
<el-table-column label="鏉ユ簮" prop="source" sortable :show-overflow-tooltip="true" width="120" align="center" >
<template slot-scope="scope">{{scope.row.source? scope.row.source: '鈥斺�斺�斺��'}}</template>
</el-table-column>
+ <el-table-column label="鏄惁闅愯棌" prop="isHide">
+
+
+ </el-table-column>
<el-table-column label="鎸佹湁鑰�" prop="owner" sortable :show-overflow-tooltip="true" width="110" align="center">
<template slot-scope="scope">{{scope.row.owner? scope.row.owner: '鈥斺�斺�斺��'}}</template>
@@ -334,10 +338,67 @@
<el-input v-model="formDat.source" placeholder="璇疯緭鍏ユ潵婧�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鎸佹湁鑰�" prop="owner">
+<!-- <el-form-item label="鎸佹湁鑰�" prop="owner">
<el-input v-model="formDat.owner" placeholder="璇疯緭鍏ユ寔鏈夎��" clearable :style="{width: '100%'}" >
</el-input>
- </el-form-item>
+ </el-form-item> -->
+
+ <!-- 瀹舵棌鎴愬憳閫夋嫨瀛楁 -->
+ <el-form-item label="鎸佹湁鑰�" prop="selectedMemberIds">
+ <!-- 宸查�夋垚鍛樺洖鏄惧尯鍩� -->
+ <div v-if="selectedMemberNames.length > 0" class="selected-members">
+ <el-tag
+ v-for="(name, index) in selectedMemberNames"
+ :key="index"
+ closable
+ @close="handleTagClose(index)"
+ >
+ {{ name }}
+ </el-tag>
+ </div>
+ <!-- 瑙﹀彂寮圭獥鎸夐挳 -->
+ <el-button
+ type="primary"
+ icon="el-icon-user-plus"
+ @click="openMemberDialog"
+ :disabled="loading"
+ >
+ 閫夋嫨瀹舵棌鎴愬憳
+ </el-button>
+ </el-form-item>
+
+ <!-- 鍏跺畠浜洪�夋嫨瀛楁 -->
+ <el-form-item label="鍏跺畠浜�" prop="otherPeople">
+ <!-- 宸查�夊叾瀹冧汉鍥炴樉鍖哄煙 -->
+ <div v-if="formDat.otherPeople && formDat.otherPeople.length > 0" class="selected-members">
+ <el-tag
+ v-for="(name, index) in formDat.otherPeople"
+ :key="index"
+ closable
+ @close="handleOtherPeopleTagClose(index)"
+ >
+ {{ name }}
+ </el-tag>
+ </div>
+ <!-- 瑙﹀彂寮圭獥鎸夐挳 -->
+ <el-button
+ type="primary"
+ icon="el-icon-user"
+ @click="openOtherPeopleDialog"
+ :disabled="loading"
+ >
+ 娣诲姞鍏跺畠浜�
+ </el-button>
+ </el-form-item>
+
+ <el-form-item label="鏄惁闅愯棌" prop="isHide">
+
+ <el-radio-group v-model="formDat.isHide" :style="{width: '100%'}">
+ <el-radio label="鏄�">鏄�</el-radio>
+ <el-radio label="鍚�">鍚�</el-radio>
+ </el-radio-group>
+
+ </el-form-item>
<el-form-item label="浠锋牸" prop="price">
<el-input v-model="formDat.price" type="number" placeholder="璇疯緭鍏ヤ环鏍�" clearable :style="{width: '100%'}" >
</el-input>
@@ -611,6 +672,104 @@
</el-dialog>
+ <!-- 鍏跺畠浜哄脊绐� -->
+ <el-dialog
+ :visible.sync="otherPeopleDialogVisible"
+ title="娣诲姞鍏跺畠浜�"
+ width="400px"
+ :close-on-click-modal="false"
+ @close="handleOtherPeopleDialogClose"
+ >
+ <div class="other-people-dialog">
+ <el-input
+ v-model="otherPeopleInput"
+ placeholder="璇疯緭鍏ュ鍚嶏紝鎸夊洖杞︽垨鐐瑰嚮娣诲姞鎸夐挳娣诲姞"
+ @keyup.enter.native="addOtherPeople"
+ style="margin-bottom: 20px;"
+ >
+ <el-button slot="append" icon="el-icon-plus" @click="addOtherPeople">娣诲姞</el-button>
+ </el-input>
+
+ <!-- 宸叉坊鍔犵殑鍏跺畠浜哄垪琛� -->
+ <div v-if="formDat.otherPeople && formDat.otherPeople.length > 0" class="added-people-list">
+ <el-divider content-position="left">宸叉坊鍔� ({{ formDat.otherPeople.length }}浜�)</el-divider>
+ <el-tag
+ v-for="(name, index) in formDat.otherPeople"
+ :key="index"
+ closable
+ @close="handleOtherPeopleTagClose(index)"
+ style="margin-right: 8px; margin-bottom: 8px;"
+ >
+ {{ name }}
+ </el-tag>
+ </div>
+
+ <div v-else class="no-people" style="padding: 20px 0;">
+ <el-empty description="鏆傛湭娣诲姞浠讳綍浜�" :image-size="60"></el-empty>
+ </div>
+ </div>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="confirmOtherPeople">瀹屾垚</el-button>
+ </div>
+ </el-dialog>
+ <el-dialog
+ :visible.sync="memberDialogVisible"
+ title="閫夋嫨瀹舵棌鎴愬憳"
+ width="50%"
+ :close-on-click-modal="false"
+ >
+ <!-- 寮圭獥鍐呭鍖� -->
+ <div class="member-dialog-content">
+ <!-- 鎼滅储妗� -->
+ <el-input
+ v-model="memberSearch"
+ placeholder="鎼滅储鎴愬憳濮撳悕..."
+ prefix-icon="el-icon-search"
+ style="margin-bottom: 20px;"
+ ></el-input>
+
+
+
+ <!-- 鍔犺浇鐘舵�� -->
+ <div v-if="loading" class="loading-container">
+ <el-loading-spinner></el-loading-spinner>
+ <p>鍔犺浇瀹舵棌鎴愬憳涓�...</p>
+ </div>
+
+ <div v-else-if="familyMembers.length === 0" class="no-data">
+ <el-empty description="鏆傛棤瀹舵棌鎴愬憳鏁版嵁"></el-empty>
+ </div>
+<label v-for="item in familyMembers" :key="item.userId" class="signature-checkbox">
+ <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
+
+
+ >
+ 4545
+
+ </el-checkbox>
+ </el-checkbox-group> -->
+
+</div>
+ <!-- 寮圭獥搴曢儴鎸夐挳 -->
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="memberDialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="confirmMemberSelection">纭閫夋嫨</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -628,12 +787,23 @@
import {Message} from "element-ui";
import {showShareUser} from "@/api/bignote/index";
import {getAllInfo} from "@/api/system/user"
+import { getFamilyMembers,listAnotherFamilyInfo } from '@/api/root'; // 鍋囪鑾峰彇瀹舵棌鎴愬憳鐨凙PI
export default {
name: "ZfCollection",
dicts: ['sys_normal_disable'],
data() {
return {
+ // 鎴愬憳澶氶�夌浉鍏�
+ memberDialogVisible: false, // 寮圭獥鍙鎬�
+ familyMembers: [], // 瀹舵棌鎴愬憳鍒楄〃锛堝師濮嬫暟鎹級
+ anotherFamilyMembers: [], //鍙﹀瀹舵棌鎴愬憳淇℃伅
+ selectedMemberIds: [], // 寮圭獥涓复鏃堕�変腑鐨勬垚鍛業D锛堢敤浜庡閫変氦浜掞級
+ memberSearch: '', // 鎴愬憳鎼滅储鍏抽敭璇�
+ loading: false, // 鍔犺浇鐘舵��
+ // 鍏跺畠浜哄脊绐楃浉鍏�
+ otherPeopleDialogVisible: false,
+ otherPeopleInput: '',
// 鍒嗕韩缁欒皝鐨刲ist
listRoot: [],
open1:false,
@@ -722,6 +892,7 @@
location:undefined,
remark:undefined,
url: "",
+ otherPeople:[],
},
// 鑿滃崟鍒楄〃
@@ -805,6 +976,56 @@
this.getList1();
},
+ computed: {
+ // 宸查�夋垚鍛樺鍚嶏紙鐢ㄤ簬鍥炴樉锛�
+ selectedMemberNames() {
+
+
+ // 浼樺厛浣跨敤鐩存帴璁剧疆鐨勬樉绀哄悕绉�
+ 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);
+ },
+ // 杩囨护鍚庣殑鎴愬憳鍒楄〃锛堟悳绱㈠姛鑳斤級
+ filteredMembers() {
+ if (!this.memberSearch) return this.familyMembers;
+ console.log(this.familyMembers)
+ console.log("-sdf")
+ const keyword = this.memberSearch.toLowerCase();
+ return this.familyMembers;
+ //.filter(member =>
+ // member.filteredMembers.toLowerCase().includes(keyword)
+ //||
+ // member.role.toLowerCase().includes(keyword)
+ // );
+ }
+ },
methods: {
// 鍒嗛〉
fenYe(){
@@ -938,7 +1159,7 @@
},
getList1() {
let userId = this.$store.state.user.userId
-
+
this.userOptions = []
showShareUser(userId, 2018).then(response=>{
console.log("===========ddddddddddddd")
@@ -948,11 +1169,11 @@
this.userOptions.push({label: element.oldName,value: element.userId})
})
})
-
-
-
+
+
+
let clanId = this.$store.state.user.clanId
-
+
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -1189,7 +1410,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
- this.open2 = false;
+ this.open2 = false;
this.$router.push("/familymodel/collection/collectionInfo/" + id);
},
@@ -1217,7 +1438,13 @@
this.$refs["elForm"].validate(valid => {
if (valid) {
-
+ var pel = ""
+ pel = pel + this.selectedMemberNames.join(",")
+ if(this.formDat.otherPeople.length != 0)
+ {
+ pel = pel +";"+ this.formDat.otherPeople.join(",")
+ }
+ this.formDat.owner = pel;
addCollection(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
@@ -1234,6 +1461,8 @@
this.handleRemoveFile(this.fileListOther[0]);
}
this.getList();
+ this.selectedMemberNames = [];
+ this.displayMemberNames = []
});
}
});
@@ -1380,7 +1609,119 @@
Message({ message: "瀵煎叆澶辫触", type: 'error' })
})
- }
+ },
+
+ // 鎵撳紑鎴愬憳澶氶�夊脊绐�
+ async openMemberDialog() {
+ this.memberDialogVisible = true;
+ this.memberSearch = ''; // 閲嶇疆鎼滅储
+ // 鍒濆鍖栧脊绐楅�変腑鐘舵�侊紙鍥炴樉宸查�夋垚鍛橈級
+ // this.selectedMemberIds = [...this.familyForm.selectedMemberIds];
+ // 鍔犺浇瀹舵棌鎴愬憳鍒楄〃
+ await this.loadFamilyMembers();
+ },
+
+ // 鍔犺浇瀹舵棌鎴愬憳鍒楄〃
+ async loadFamilyMembers() {
+ this.loading = true;
+
+ let clanId = this.$store.state.user.clanId
+ let userId = this.$store.state.user.userId
+ // alert(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.length)
+ // console.log(this.familyMembers.length)
+ // console.log(this.familyMembers[0])
+ // for(let i=0; i < this.familyMembers.length; i++)
+ // console.log(this.familyMembers[i])
+ // console.log("---999")
+ // 鏍煎紡锛歔{ id: 1, name: '寮犱笁', role: '瀹堕暱', relation: '鐖跺瓙', avatar: 'xxx' }, ...]
+ } catch (err) {
+ this.$message.error('鍔犺浇瀹舵棌鎴愬憳澶辫触锛岃閲嶈瘯');
+ } finally {
+ this.loading = false;
+ }
+ },
+
+ // 纭閫夋嫨鎴愬憳锛堜繚瀛樺埌琛ㄥ崟锛�
+ confirmMemberSelection() {
+ console.log()
+ this.formDat.selectedMemberIds = [...this.selectedMemberIds]; // 灏嗗脊绐楅�変腑鐨処D鍚屾鍒拌〃鍗�
+ this.memberDialogVisible = false;
+ this.$message.info(`宸查�夋嫨 ${this.selectedMemberNames.length} 鍚嶅鏃忔垚鍛榒);
+ // 娓呯┖瀵硅瘽妗嗛噷闈㈤�夋嫨鐨勫唴瀹�
+ // if(this.displayMemberNames.length==0)
+ this.displayMemberNames = this.selectedMemberNames
+ this.selectedMemberIds = [];
+ },
+ handleTagClose(index, name) {
+ // 浠� selectedMemberNames 鏁扮粍涓Щ闄ゅ綋鍓嶅叧闂殑鏍囩鍚嶇О
+ // const index = this.selectedMemberNames.findIndex(item=== name);
+ selectedMemberIds: this.selectedMemberIds.filter(
+ item => item!== index // 杩囨护鎺変笌鍏抽棴鍚嶇О鐩稿悓鐨勫厓绱�
+ )
+ this.$forceUpdate();
+ console.log(this.selectedMemberIds)
+ this.selectedMemberNames.splice(index, 1);
+ this.$forceUpdate();
+ selectedMemberNames: this.selectedMemberNames.filter(
+ item => item !== name // 杩囨护鎺変笌鍏抽棴鍚嶇О鐩稿悓鐨勫厓绱�
+ )
+ this.displayMemberNames = this.selectedMemberNames
+ console.log(this.selectedMemberNames)
+
+ },
+ openOtherPeopleDialog(){
+ alert(23)
+ this.otherPeopleDialogVisible = true;
+ this.otherPeopleInput = ''; // 娓呯┖杈撳叆妗�
+ },
+
+ // 娣诲姞鍏跺畠浜猴紙鏀寔鍥炶溅鍜岀偣鍑绘坊鍔犳寜閽級
+ addOtherPeople() {
+ const name = this.otherPeopleInput.trim();
+ if (!name) {
+ this.$message.warning('璇疯緭鍏ュ鍚�');
+ return;
+ }
+ if (this.formDat.otherPeople.includes(name)) {
+ this.$message.warning('璇ュ鍚嶅凡娣诲姞');
+ return;
+ }
+ this.formDat.otherPeople.push(name);
+ this.otherPeopleInput = ''; // 娓呯┖杈撳叆妗嗭紝鍑嗗杈撳叆涓嬩竴涓�
+ this.$message.success(`宸叉坊鍔�: ${name}`);
+ },
+
+ // 纭瀹屾垚锛堝叧闂脊绐楋級
+ confirmOtherPeople() {
+ if (this.formDat.otherPeople.length > 0) {
+ this.$message.success(`宸叉坊鍔� ${this.formDat.otherPeople.length} 鍚嶅叾瀹冧汉`);
+ } else {
+ this.$message.info('鏈坊鍔犱换浣曞叾瀹冧汉');
+ }
+ this.otherPeopleDialogVisible = false;
+ },
+
+ // 鍏抽棴鍏跺畠浜烘爣绛�
+ handleOtherPeopleTagClose(index) {
+ const removedName = this.formDat.otherPeople[index];
+ this.formDat.otherPeople.splice(index, 1);
+ this.$message.info(`宸茬Щ闄�: ${removedName}`);
+ },
+
+ // 鍏跺畠浜哄脊绐楀叧闂鐞�
+ handleOtherPeopleDialogClose() {
+ this.otherPeopleInput = '';
+ },
+
}
};
</script>
--
Gitblit v1.9.1